Remove ssl_ctrl, ssl_ctx_ctrl, ssl_callback_ctrl and ssl_ctx_callback_ctrl

from SSL_METHOD, replacing usage with direct calls to the appropriate
functions.

ok beck@

1 files changed, 1 insertions, 17 deletions

diff --git a/src/lib/libssl/t1_meth.c b/src/lib/libssl/t1_meth.c
index 5c37142ab3..521839184c 100644
--- a/src/lib/libssl/t1_meth.c
+++ b/src/lib/libssl/t1_meth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_meth.c,v 1.19 2017/01/21 06:50:02 jsing Exp $ */
+/* $OpenBSD: t1_meth.c,v 1.20 2017/01/23 10:22:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -83,8 +83,6 @@ static const SSL_METHOD TLS_method_data = {
         .ssl_read_bytes = ssl3_read_bytes,
         .ssl_write_bytes = ssl3_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .ssl_ctrl = ssl3_ctrl,
-        .ssl_ctx_ctrl = ssl3_ctx_ctrl,
         .get_cipher_by_char = ssl3_get_cipher_by_char,
         .put_cipher_by_char = ssl3_put_cipher_by_char,
         .ssl_pending = ssl_undefined_const_function,
@@ -94,8 +92,6 @@ static const SSL_METHOD TLS_method_data = {
         .get_timeout = ssl23_default_timeout,
         .ssl3_enc = &ssl3_undef_enc_method,
         .ssl_version = ssl_undefined_void_function,
-        .ssl_callback_ctrl = ssl3_callback_ctrl,
-        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
 static const SSL_METHOD TLSv1_method_data = {
@@ -117,8 +113,6 @@ static const SSL_METHOD TLSv1_method_data = {
         .ssl_read_bytes = ssl3_read_bytes,
         .ssl_write_bytes = ssl3_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .ssl_ctrl = ssl3_ctrl,
-        .ssl_ctx_ctrl = ssl3_ctx_ctrl,
         .get_cipher_by_char = ssl3_get_cipher_by_char,
         .put_cipher_by_char = ssl3_put_cipher_by_char,
         .ssl_pending = ssl3_pending,
@@ -128,8 +122,6 @@ static const SSL_METHOD TLSv1_method_data = {
         .get_timeout = tls1_default_timeout,
         .ssl3_enc = &TLSv1_enc_data,
         .ssl_version = ssl_undefined_void_function,
-        .ssl_callback_ctrl = ssl3_callback_ctrl,
-        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
 static const SSL_METHOD TLSv1_1_method_data = {
@@ -151,8 +143,6 @@ static const SSL_METHOD TLSv1_1_method_data = {
         .ssl_read_bytes = ssl3_read_bytes,
         .ssl_write_bytes = ssl3_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .ssl_ctrl = ssl3_ctrl,
-        .ssl_ctx_ctrl = ssl3_ctx_ctrl,
         .get_cipher_by_char = ssl3_get_cipher_by_char,
         .put_cipher_by_char = ssl3_put_cipher_by_char,
         .ssl_pending = ssl3_pending,
@@ -162,8 +152,6 @@ static const SSL_METHOD TLSv1_1_method_data = {
         .get_timeout = tls1_default_timeout,
         .ssl3_enc = &TLSv1_1_enc_data,
         .ssl_version = ssl_undefined_void_function,
-        .ssl_callback_ctrl = ssl3_callback_ctrl,
-        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
 static const SSL_METHOD TLSv1_2_method_data = {
@@ -185,8 +173,6 @@ static const SSL_METHOD TLSv1_2_method_data = {
         .ssl_read_bytes = ssl3_read_bytes,
         .ssl_write_bytes = ssl3_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .ssl_ctrl = ssl3_ctrl,
-        .ssl_ctx_ctrl = ssl3_ctx_ctrl,
         .get_cipher_by_char = ssl3_get_cipher_by_char,
         .put_cipher_by_char = ssl3_put_cipher_by_char,
         .ssl_pending = ssl3_pending,
@@ -196,8 +182,6 @@ static const SSL_METHOD TLSv1_2_method_data = {
         .get_timeout = tls1_default_timeout,
         .ssl3_enc = &TLSv1_2_enc_data,
         .ssl_version = ssl_undefined_void_function,
-        .ssl_callback_ctrl = ssl3_callback_ctrl,
-        .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
 static const SSL_METHOD *