Mop up the get_ssl_method function pointer.

Now that get_ssl_method is no longer used, we can garbage collect the
function pointer and some associated machinery.

ok beck@

2 files changed, 2 insertions, 50 deletions

diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 540afee004..4ac6b76cd3 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.291 2020/09/13 16:49:05 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.292 2020/09/15 09:41:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -383,8 +383,6 @@ typedef struct ssl_method_internal_st {
             int peek);
         int (*ssl_write_bytes)(SSL *s, int type, const void *buf_, int len);
 
-        const struct ssl_method_st *(*get_ssl_method)(int version);
-
         struct ssl3_enc_method *ssl3_enc; /* Extra SSLv3/TLS stuff */
 } SSL_METHOD_INTERNAL;
 
diff --git a/src/lib/libssl/ssl_methods.c b/src/lib/libssl/ssl_methods.c
index 5866e30f67..c500d7ac06 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.14 2020/07/07 19:31:11 jsing Exp $ */
+/* $OpenBSD: ssl_methods.c,v 1.15 2020/09/15 09:41:24 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -69,7 +69,6 @@ static const SSL_METHOD_INTERNAL DTLSv1_client_method_internal_data = {
         .ssl_accept = ssl_undefined_function,
         .ssl_connect = ssl3_connect,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = dtls1_get_client_method,
         .ssl_renegotiate = ssl3_renegotiate,
         .ssl_renegotiate_check = ssl3_renegotiate_check,
         .ssl_pending = ssl3_pending,
@@ -107,8 +106,6 @@ dtls1_get_client_method(int ver)
         return (NULL);
 }
 
-static const SSL_METHOD *dtls1_get_method(int ver);
-
 static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = {
         .version = DTLS1_VERSION,
         .min_version = DTLS1_VERSION,
@@ -119,7 +116,6 @@ static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = {
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl3_connect,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = dtls1_get_method,
         .ssl_renegotiate = ssl3_renegotiate,
         .ssl_renegotiate_check = ssl3_renegotiate_check,
         .ssl_pending = ssl3_pending,
@@ -149,14 +145,6 @@ DTLS_method(void)
         return DTLSv1_method();
 }
 
-static const SSL_METHOD *
-dtls1_get_method(int ver)
-{
-        if (ver == DTLS1_VERSION)
-                return (DTLSv1_method());
-        return (NULL);
-}
-
 static const SSL_METHOD_INTERNAL DTLSv1_server_method_internal_data = {
         .version = DTLS1_VERSION,
         .min_version = DTLS1_VERSION,
@@ -167,7 +155,6 @@ static const SSL_METHOD_INTERNAL DTLSv1_server_method_internal_data = {
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl_undefined_function,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = dtls1_get_server_method,
         .ssl_renegotiate = ssl3_renegotiate,
         .ssl_renegotiate_check = ssl3_renegotiate_check,
         .ssl_pending = ssl3_pending,
@@ -216,7 +203,6 @@ static const SSL_METHOD_INTERNAL TLS_client_method_internal_data = {
         .ssl_accept = ssl_undefined_function,
         .ssl_connect = tls13_legacy_connect,
         .ssl_shutdown = tls13_legacy_shutdown,
-        .get_ssl_method = tls1_get_client_method,
         .ssl_renegotiate = ssl_undefined_function,
         .ssl_renegotiate_check = ssl_ok,
         .ssl_pending = tls13_legacy_pending,
@@ -245,7 +231,6 @@ static const SSL_METHOD_INTERNAL TLS_legacy_client_method_internal_data = {
         .ssl_accept = ssl_undefined_function,
         .ssl_connect = ssl3_connect,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = tls1_get_client_method,
         .ssl_renegotiate = ssl_undefined_function,
         .ssl_renegotiate_check = ssl_ok,
         .ssl_pending = ssl3_pending,
@@ -273,7 +258,6 @@ static const SSL_METHOD_INTERNAL TLSv1_client_method_internal_data = {
         .ssl_accept = ssl_undefined_function,
         .ssl_connect = ssl3_connect,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = tls1_get_client_method,
         .ssl_renegotiate = ssl3_renegotiate,
         .ssl_renegotiate_check = ssl3_renegotiate_check,
         .ssl_pending = ssl3_pending,
@@ -301,7 +285,6 @@ static const SSL_METHOD_INTERNAL TLSv1_1_client_method_internal_data = {
         .ssl_accept = ssl_undefined_function,
         .ssl_connect = ssl3_connect,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = tls1_get_client_method,
         .ssl_renegotiate = ssl3_renegotiate,
         .ssl_renegotiate_check = ssl3_renegotiate_check,
         .ssl_pending = ssl3_pending,
@@ -329,7 +312,6 @@ static const SSL_METHOD_INTERNAL TLSv1_2_client_method_internal_data = {
         .ssl_accept = ssl_undefined_function,
         .ssl_connect = ssl3_connect,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = tls1_get_client_method,
         .ssl_renegotiate = ssl3_renegotiate,
         .ssl_renegotiate_check = ssl3_renegotiate_check,
         .ssl_pending = ssl3_pending,
@@ -403,8 +385,6 @@ TLSv1_2_client_method(void)
         return (&TLSv1_2_client_method_data);
 }
 
-static const SSL_METHOD *tls1_get_method(int ver);
-
 #if defined(LIBRESSL_HAS_TLS1_3_CLIENT) && defined(LIBRESSL_HAS_TLS1_3_SERVER)
 static const SSL_METHOD_INTERNAL TLS_method_internal_data = {
         .version = TLS1_3_VERSION,
@@ -416,7 +396,6 @@ static const SSL_METHOD_INTERNAL TLS_method_internal_data = {
         .ssl_accept = tls13_legacy_accept,
         .ssl_connect = tls13_legacy_connect,
         .ssl_shutdown = tls13_legacy_shutdown,
-        .get_ssl_method = tls1_get_client_method,
         .ssl_renegotiate = ssl_undefined_function,
         .ssl_renegotiate_check = ssl_ok,
         .ssl_pending = tls13_legacy_pending,
@@ -445,7 +424,6 @@ static const SSL_METHOD_INTERNAL TLS_legacy_method_internal_data = {
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl3_connect,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = tls1_get_method,
         .ssl_renegotiate = ssl_undefined_function,
         .ssl_renegotiate_check = ssl_ok,
         .ssl_pending = ssl3_pending,
@@ -473,7 +451,6 @@ static const SSL_METHOD_INTERNAL TLSv1_method_internal_data = {
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl3_connect,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = tls1_get_method,
         .ssl_renegotiate = ssl3_renegotiate,
         .ssl_renegotiate_check = ssl3_renegotiate_check,
         .ssl_pending = ssl3_pending,
@@ -501,7 +478,6 @@ static const SSL_METHOD_INTERNAL TLSv1_1_method_internal_data = {
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl3_connect,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = tls1_get_method,
         .ssl_renegotiate = ssl3_renegotiate,
         .ssl_renegotiate_check = ssl3_renegotiate_check,
         .ssl_pending = ssl3_pending,
@@ -529,7 +505,6 @@ static const SSL_METHOD_INTERNAL TLSv1_2_method_internal_data = {
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl3_connect,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = tls1_get_method,
         .ssl_renegotiate = ssl3_renegotiate,
         .ssl_renegotiate_check = ssl3_renegotiate_check,
         .ssl_pending = ssl3_pending,
@@ -547,22 +522,6 @@ static const SSL_METHOD TLSv1_2_method_data = {
         .internal = &TLSv1_2_method_internal_data,
 };
 
-static const SSL_METHOD *
-tls1_get_method(int ver)
-{
-#if defined(LIBRESSL_HAS_TLS1_3_CLIENT) && defined(LIBRESSL_HAS_TLS1_3_SERVER)
-        if (ver == TLS1_3_VERSION)
-                return (TLS_method());
-#endif
-        if (ver == TLS1_2_VERSION)
-                return (TLSv1_2_method());
-        if (ver == TLS1_1_VERSION)
-                return (TLSv1_1_method());
-        if (ver == TLS1_VERSION)
-                return (TLSv1_method());
-        return (NULL);
-}
-
 const SSL_METHOD *
 SSLv23_method(void)
 {
@@ -614,7 +573,6 @@ static const SSL_METHOD_INTERNAL TLS_server_method_internal_data = {
         .ssl_accept = tls13_legacy_accept,
         .ssl_connect = ssl_undefined_function,
         .ssl_shutdown = tls13_legacy_shutdown,
-        .get_ssl_method = tls1_get_server_method,
         .ssl_renegotiate = ssl_undefined_function,
         .ssl_renegotiate_check = ssl_ok,
         .ssl_pending = tls13_legacy_pending,
@@ -643,7 +601,6 @@ static const SSL_METHOD_INTERNAL TLS_legacy_server_method_internal_data = {
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl_undefined_function,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = tls1_get_server_method,
         .ssl_renegotiate = ssl_undefined_function,
         .ssl_renegotiate_check = ssl_ok,
         .ssl_pending = ssl3_pending,
@@ -671,7 +628,6 @@ static const SSL_METHOD_INTERNAL TLSv1_server_method_internal_data = {
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl_undefined_function,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = tls1_get_server_method,
         .ssl_renegotiate = ssl3_renegotiate,
         .ssl_renegotiate_check = ssl3_renegotiate_check,
         .ssl_pending = ssl3_pending,
@@ -699,7 +655,6 @@ static const SSL_METHOD_INTERNAL TLSv1_1_server_method_internal_data = {
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl_undefined_function,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = tls1_get_server_method,
         .ssl_renegotiate = ssl3_renegotiate,
         .ssl_renegotiate_check = ssl3_renegotiate_check,
         .ssl_pending = ssl3_pending,
@@ -727,7 +682,6 @@ static const SSL_METHOD_INTERNAL TLSv1_2_server_method_internal_data = {
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl_undefined_function,
         .ssl_shutdown = ssl3_shutdown,
-        .get_ssl_method = tls1_get_server_method,
         .ssl_renegotiate = ssl3_renegotiate,
         .ssl_renegotiate_check = ssl3_renegotiate_check,
         .ssl_pending = ssl3_pending,