From fbb23402e63e54d6d2231406a88302014f0c6ca6 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Tue, 7 Jul 2020 19:31:11 +0000 Subject: Remove some unnecessary function pointers from SSL_METHOD_INTERNAL. ssl_version is completely unused and get_timeout is the same everywhere. ok beck@ inoguchi@ tb@ --- src/lib/libssl/ssl_methods.c | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) (limited to 'src/lib/libssl/ssl_methods.c') diff --git a/src/lib/libssl/ssl_methods.c b/src/lib/libssl/ssl_methods.c index d679e3242f..5866e30f67 100644 --- a/src/lib/libssl/ssl_methods.c +++ b/src/lib/libssl/ssl_methods.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_methods.c,v 1.13 2020/07/07 19:24:23 jsing Exp $ */ +/* $OpenBSD: ssl_methods.c,v 1.14 2020/07/07 19:31:11 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -70,8 +70,6 @@ static const SSL_METHOD_INTERNAL DTLSv1_client_method_internal_data = { .ssl_connect = ssl3_connect, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = dtls1_get_client_method, - .get_timeout = dtls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_pending = ssl3_pending, @@ -122,8 +120,6 @@ static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = { .ssl_connect = ssl3_connect, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = dtls1_get_method, - .get_timeout = dtls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_pending = ssl3_pending, @@ -172,8 +168,6 @@ static const SSL_METHOD_INTERNAL DTLSv1_server_method_internal_data = { .ssl_connect = ssl_undefined_function, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = dtls1_get_server_method, - .get_timeout = dtls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_pending = ssl3_pending, @@ -223,8 +217,6 @@ static const SSL_METHOD_INTERNAL TLS_client_method_internal_data = { .ssl_connect = tls13_legacy_connect, .ssl_shutdown = tls13_legacy_shutdown, .get_ssl_method = tls1_get_client_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl_undefined_function, .ssl_renegotiate_check = ssl_ok, .ssl_pending = tls13_legacy_pending, @@ -254,8 +246,6 @@ static const SSL_METHOD_INTERNAL TLS_legacy_client_method_internal_data = { .ssl_connect = ssl3_connect, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = tls1_get_client_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl_undefined_function, .ssl_renegotiate_check = ssl_ok, .ssl_pending = ssl3_pending, @@ -284,8 +274,6 @@ static const SSL_METHOD_INTERNAL TLSv1_client_method_internal_data = { .ssl_connect = ssl3_connect, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = tls1_get_client_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_pending = ssl3_pending, @@ -314,8 +302,6 @@ static const SSL_METHOD_INTERNAL TLSv1_1_client_method_internal_data = { .ssl_connect = ssl3_connect, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = tls1_get_client_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_pending = ssl3_pending, @@ -344,8 +330,6 @@ static const SSL_METHOD_INTERNAL TLSv1_2_client_method_internal_data = { .ssl_connect = ssl3_connect, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = tls1_get_client_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_pending = ssl3_pending, @@ -433,8 +417,6 @@ static const SSL_METHOD_INTERNAL TLS_method_internal_data = { .ssl_connect = tls13_legacy_connect, .ssl_shutdown = tls13_legacy_shutdown, .get_ssl_method = tls1_get_client_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl_undefined_function, .ssl_renegotiate_check = ssl_ok, .ssl_pending = tls13_legacy_pending, @@ -464,8 +446,6 @@ static const SSL_METHOD_INTERNAL TLS_legacy_method_internal_data = { .ssl_connect = ssl3_connect, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = tls1_get_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl_undefined_function, .ssl_renegotiate_check = ssl_ok, .ssl_pending = ssl3_pending, @@ -494,8 +474,6 @@ static const SSL_METHOD_INTERNAL TLSv1_method_internal_data = { .ssl_connect = ssl3_connect, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = tls1_get_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_pending = ssl3_pending, @@ -524,8 +502,6 @@ static const SSL_METHOD_INTERNAL TLSv1_1_method_internal_data = { .ssl_connect = ssl3_connect, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = tls1_get_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_pending = ssl3_pending, @@ -554,8 +530,6 @@ static const SSL_METHOD_INTERNAL TLSv1_2_method_internal_data = { .ssl_connect = ssl3_connect, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = tls1_get_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_pending = ssl3_pending, @@ -641,8 +615,6 @@ static const SSL_METHOD_INTERNAL TLS_server_method_internal_data = { .ssl_connect = ssl_undefined_function, .ssl_shutdown = tls13_legacy_shutdown, .get_ssl_method = tls1_get_server_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl_undefined_function, .ssl_renegotiate_check = ssl_ok, .ssl_pending = tls13_legacy_pending, @@ -672,8 +644,6 @@ static const SSL_METHOD_INTERNAL TLS_legacy_server_method_internal_data = { .ssl_connect = ssl_undefined_function, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = tls1_get_server_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl_undefined_function, .ssl_renegotiate_check = ssl_ok, .ssl_pending = ssl3_pending, @@ -702,8 +672,6 @@ static const SSL_METHOD_INTERNAL TLSv1_server_method_internal_data = { .ssl_connect = ssl_undefined_function, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = tls1_get_server_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_pending = ssl3_pending, @@ -732,8 +700,6 @@ static const SSL_METHOD_INTERNAL TLSv1_1_server_method_internal_data = { .ssl_connect = ssl_undefined_function, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = tls1_get_server_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_pending = ssl3_pending, @@ -762,8 +728,6 @@ static const SSL_METHOD_INTERNAL TLSv1_2_server_method_internal_data = { .ssl_connect = ssl_undefined_function, .ssl_shutdown = ssl3_shutdown, .get_ssl_method = tls1_get_server_method, - .get_timeout = tls1_default_timeout, - .ssl_version = ssl_undefined_void_function, .ssl_renegotiate = ssl3_renegotiate, .ssl_renegotiate_check = ssl3_renegotiate_check, .ssl_pending = ssl3_pending, -- cgit v1.2.3-55-g6feb