From 7f7a910b6e8d5e564f5ce174236e44de0725f801 Mon Sep 17 00:00:00 2001 From: Frederik Wedel-Heinen Date: Mon, 15 Jan 2024 20:05:26 +0100 Subject: [PATCH] Removes unsed function: ssl_bad_method() Reviewed-by: Neil Horman Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/23307) --- include/openssl/sslerr_legacy.h | 1 - ssl/ssl_lib.c | 6 ------ ssl/ssl_local.h | 1 - 3 files changed, 8 deletions(-) diff --git a/include/openssl/sslerr_legacy.h b/include/openssl/sslerr_legacy.h index ccf6d3b30b..929835c29b 100644 --- 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 13326d8925..5c8a780c19 100644 --- 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 4e99ada22c..aeb0036d3c 100644 --- 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); -- 2.39.2