Removes unsed function: ssl_bad_method()

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23307)

diff --git a/include/openssl/sslerr_legacy.h b/include/openssl/sslerr_legacy.h
index ccf6d3b30b76f38b6a09dfb2b11671f5759fc666..929835c29baff8f45449f2c11e5030afebd6d9a9 100644 (file)
--- a/include/openssl/sslerr_legacy.h
+++ b/include/openssl/sslerr_legacy.h
@@ -143,7 +143,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
 #  define SSL_F_SSL_ADD_SERVERHELLO_RENEGOTIATE_EXT        0
 #  define SSL_F_SSL_ADD_SERVERHELLO_TLSEXT                 0
 #  define SSL_F_SSL_ADD_SERVERHELLO_USE_SRTP_EXT           0
-#  define SSL_F_SSL_BAD_METHOD                             0
 #  define SSL_F_SSL_BUILD_CERT_CHAIN                       0
 #  define SSL_F_SSL_BYTES_TO_CIPHER_LIST                   0
 #  define SSL_F_SSL_CACHE_CIPHERLIST                       0

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 13326d89256fffc3f5b60b78b3bd0cc040bbf8b7..5c8a780c19079f2d8b159058cf46777f8fc1777e 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -4804,12 +4804,6 @@ int ssl_undefined_const_function(const SSL *s)
     return 0;
 }
 
-const SSL_METHOD *ssl_bad_method(int ver)
-{
-    ERR_raise(ERR_LIB_SSL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
-    return NULL;
-}
-
 const char *ssl_protocol_to_string(int version)
 {
     switch (version)

diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h
index 4e99ada22cdf249d2eccbecc3e021e85302e877a..aeb0036d3cefb9162301985df2ae7f23e1f42c67 100644 (file)
--- a/ssl/ssl_local.h
+++ b/ssl/ssl_local.h
@@ -2235,7 +2235,6 @@ extern const unsigned char tls12downgrade[8];
 
 extern SSL3_ENC_METHOD ssl3_undef_enc_method;
 
-__owur const SSL_METHOD *ssl_bad_method(int ver);
 __owur const SSL_METHOD *sslv3_method(void);
 __owur const SSL_METHOD *sslv3_server_method(void);
 __owur const SSL_METHOD *sslv3_client_method(void);