1 files changed, 1 insertions, 49 deletions

diff --git a/src/lib/libssl/ssl_methods.c b/src/lib/libssl/ssl_methods.c
index a3097c37b9..b9b8a95e56 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.26 2021/07/01 17:53:39 jsing Exp $ */
+/* $OpenBSD: ssl_methods.c,v 1.27 2021/07/03 16:06:45 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -78,10 +78,7 @@ static const SSL_METHOD DTLS_method_data = {
         .ssl_read_bytes = dtls1_read_bytes,
         .ssl_write_bytes = dtls1_write_app_data_bytes,
         .ssl_dispatch_alert = dtls1_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = dtls1_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_2_ENC_FLAGS,
 };
 
@@ -103,10 +100,7 @@ static const SSL_METHOD DTLS_client_method_data = {
         .ssl_read_bytes = dtls1_read_bytes,
         .ssl_write_bytes = dtls1_write_app_data_bytes,
         .ssl_dispatch_alert = dtls1_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = dtls1_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_2_ENC_FLAGS,
 };
 
@@ -128,10 +122,7 @@ static const SSL_METHOD DTLSv1_method_data = {
         .ssl_read_bytes = dtls1_read_bytes,
         .ssl_write_bytes = dtls1_write_app_data_bytes,
         .ssl_dispatch_alert = dtls1_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = dtls1_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_1_ENC_FLAGS,
 };
 
@@ -153,10 +144,7 @@ static const SSL_METHOD DTLSv1_client_method_data = {
         .ssl_read_bytes = dtls1_read_bytes,
         .ssl_write_bytes = dtls1_write_app_data_bytes,
         .ssl_dispatch_alert = dtls1_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = dtls1_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_1_ENC_FLAGS,
 };
 
@@ -178,10 +166,7 @@ static const SSL_METHOD DTLSv1_2_method_data = {
         .ssl_read_bytes = dtls1_read_bytes,
         .ssl_write_bytes = dtls1_write_app_data_bytes,
         .ssl_dispatch_alert = dtls1_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = dtls1_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_2_ENC_FLAGS,
 };
 
@@ -203,10 +188,7 @@ static const SSL_METHOD DTLSv1_2_client_method_data = {
         .ssl_read_bytes = dtls1_read_bytes,
         .ssl_write_bytes = dtls1_write_app_data_bytes,
         .ssl_dispatch_alert = dtls1_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = dtls1_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_2_ENC_FLAGS,
 };
 
@@ -283,10 +265,7 @@ static const SSL_METHOD TLS_method_data = {
         .ssl_read_bytes = tls13_legacy_read_bytes,
         .ssl_write_bytes = tls13_legacy_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = ssl3_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_3_ENC_FLAGS,
 };
 #endif
@@ -309,10 +288,7 @@ static const SSL_METHOD TLS_legacy_method_data = {
         .ssl_read_bytes = ssl3_read_bytes,
         .ssl_write_bytes = ssl3_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = ssl3_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_2_ENC_FLAGS,
 };
 
@@ -335,10 +311,7 @@ static const SSL_METHOD TLS_client_method_data = {
         .ssl_read_bytes = tls13_legacy_read_bytes,
         .ssl_write_bytes = tls13_legacy_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = ssl3_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_3_ENC_FLAGS,
 };
 
@@ -362,10 +335,7 @@ static const SSL_METHOD TLS_legacy_client_method_data = {
         .ssl_read_bytes = ssl3_read_bytes,
         .ssl_write_bytes = ssl3_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = ssl3_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_2_ENC_FLAGS,
 };
 #endif
@@ -388,10 +358,7 @@ static const SSL_METHOD TLSv1_method_data = {
         .ssl_read_bytes = ssl3_read_bytes,
         .ssl_write_bytes = ssl3_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = ssl3_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_ENC_FLAGS,
 };
 
@@ -413,10 +380,7 @@ static const SSL_METHOD TLSv1_client_method_data = {
         .ssl_read_bytes = ssl3_read_bytes,
         .ssl_write_bytes = ssl3_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = ssl3_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_ENC_FLAGS,
 };
 
@@ -438,10 +402,7 @@ static const SSL_METHOD TLSv1_1_method_data = {
         .ssl_read_bytes = ssl3_read_bytes,
         .ssl_write_bytes = ssl3_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = ssl3_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_1_ENC_FLAGS,
 };
 
@@ -463,10 +424,7 @@ static const SSL_METHOD TLSv1_1_client_method_data = {
         .ssl_read_bytes = ssl3_read_bytes,
         .ssl_write_bytes = ssl3_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = ssl3_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_1_ENC_FLAGS,
 };
 
@@ -488,10 +446,7 @@ static const SSL_METHOD TLSv1_2_method_data = {
         .ssl_read_bytes = ssl3_read_bytes,
         .ssl_write_bytes = ssl3_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = ssl3_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_2_ENC_FLAGS,
 };
 
@@ -513,10 +468,7 @@ static const SSL_METHOD TLSv1_2_client_method_data = {
         .ssl_read_bytes = ssl3_read_bytes,
         .ssl_write_bytes = ssl3_write_bytes,
         .ssl_dispatch_alert = ssl3_dispatch_alert,
-        .num_ciphers = ssl3_num_ciphers,
         .get_cipher = ssl3_get_cipher,
-        .get_cipher_by_char = ssl3_get_cipher_by_char,
-        .put_cipher_by_char = ssl3_put_cipher_by_char,
         .enc_flags = TLSV1_2_ENC_FLAGS,
 };