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_srvr.c b/src/lib/libssl/t1_srvr.c
index 84ed66c7ed..e0b247441a 100644
--- a/src/lib/libssl/t1_srvr.c
+++ b/src/lib/libssl/t1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_srvr.c,v 1.21 2017/01/21 06:50:02 jsing Exp $ */
+/* $OpenBSD: t1_srvr.c,v 1.22 2017/01/23 10:22:06 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -86,8 +86,6 @@ static const SSL_METHOD TLS_server_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,
@@ -97,8 +95,6 @@ static const SSL_METHOD TLS_server_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_server_method_data = {
@@ -120,8 +116,6 @@ static const SSL_METHOD TLSv1_server_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,
@@ -131,8 +125,6 @@ static const SSL_METHOD TLSv1_server_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_server_method_data = {
@@ -154,8 +146,6 @@ static const SSL_METHOD TLSv1_1_server_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,
@@ -165,8 +155,6 @@ static const SSL_METHOD TLSv1_1_server_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_server_method_data = {
@@ -188,8 +176,6 @@ static const SSL_METHOD TLSv1_2_server_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,
@@ -199,8 +185,6 @@ static const SSL_METHOD TLSv1_2_server_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 *