Nuke SSLv3_enc_data.

ok "flensing knife"

4 files changed, 6 insertions, 48 deletions

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 4e6b123698..b68aaabbbf 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.101 2015/09/10 15:56:26 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.102 2015/09/11 16:50:46 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1896,26 +1896,6 @@ SSL_CIPHER ssl3_ciphers[] = {
         /* end of list */
 };
 
-SSL3_ENC_METHOD SSLv3_enc_data = {
-        .enc = ssl3_enc,
-        .mac = n_ssl3_mac,
-        .setup_key_block = ssl3_setup_key_block,
-        .generate_master_secret = ssl3_generate_master_secret,
-        .change_cipher_state = ssl3_change_cipher_state,
-        .final_finish_mac = ssl3_final_finish_mac,
-        .finish_mac_length = MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH,
-        .cert_verify_mac = ssl3_cert_verify_mac,
-        .client_finished_label = SSL3_MD_CLIENT_FINISHED_CONST,
-        .client_finished_label_len = 4,
-        .server_finished_label = SSL3_MD_SERVER_FINISHED_CONST,
-        .server_finished_label_len = 4,
-        .alert_value = ssl3_alert_code,
-        .export_keying_material = (int (*)(SSL *, unsigned char *, size_t,
-            const char *, size_t, const unsigned char *, size_t,
-            int use_context))ssl_undefined_function,
-        .enc_flags = 0,
-};
-
 long
 ssl3_default_timeout(void)
 {
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c
index 4e6b123698..b68aaabbbf 100644
--- a/src/lib/libssl/src/ssl/s3_lib.c
+++ b/src/lib/libssl/src/ssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.101 2015/09/10 15:56:26 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.102 2015/09/11 16:50:46 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1896,26 +1896,6 @@ SSL_CIPHER ssl3_ciphers[] = {
         /* end of list */
 };
 
-SSL3_ENC_METHOD SSLv3_enc_data = {
-        .enc = ssl3_enc,
-        .mac = n_ssl3_mac,
-        .setup_key_block = ssl3_setup_key_block,
-        .generate_master_secret = ssl3_generate_master_secret,
-        .change_cipher_state = ssl3_change_cipher_state,
-        .final_finish_mac = ssl3_final_finish_mac,
-        .finish_mac_length = MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH,
-        .cert_verify_mac = ssl3_cert_verify_mac,
-        .client_finished_label = SSL3_MD_CLIENT_FINISHED_CONST,
-        .client_finished_label_len = 4,
-        .server_finished_label = SSL3_MD_SERVER_FINISHED_CONST,
-        .server_finished_label_len = 4,
-        .alert_value = ssl3_alert_code,
-        .export_keying_material = (int (*)(SSL *, unsigned char *, size_t,
-            const char *, size_t, const unsigned char *, size_t,
-            int use_context))ssl_undefined_function,
-        .enc_flags = 0,
-};
-
 long
 ssl3_default_timeout(void)
 {
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index ea14ae0398..8ad1535979 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.104 2015/09/11 16:28:37 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.105 2015/09/11 16:50:46 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -547,11 +547,10 @@ SSL_METHOD *ssl_bad_method(int ver);
 const char *ssl_version_string(int ver);
 uint16_t ssl_max_server_version(SSL *s);
 
+extern SSL3_ENC_METHOD DTLSv1_enc_data;
 extern SSL3_ENC_METHOD TLSv1_enc_data;
 extern SSL3_ENC_METHOD TLSv1_1_enc_data;
 extern SSL3_ENC_METHOD TLSv1_2_enc_data;
-extern SSL3_ENC_METHOD SSLv3_enc_data;
-extern SSL3_ENC_METHOD DTLSv1_enc_data;
 
 void ssl_clear_cipher_ctx(SSL *s);
 int ssl_clear_bad_session(SSL *s);
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index ea14ae0398..8ad1535979 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.104 2015/09/11 16:28:37 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.105 2015/09/11 16:50:46 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -547,11 +547,10 @@ SSL_METHOD *ssl_bad_method(int ver);
 const char *ssl_version_string(int ver);
 uint16_t ssl_max_server_version(SSL *s);
 
+extern SSL3_ENC_METHOD DTLSv1_enc_data;
 extern SSL3_ENC_METHOD TLSv1_enc_data;
 extern SSL3_ENC_METHOD TLSv1_1_enc_data;
 extern SSL3_ENC_METHOD TLSv1_2_enc_data;
-extern SSL3_ENC_METHOD SSLv3_enc_data;
-extern SSL3_ENC_METHOD DTLSv1_enc_data;
 
 void ssl_clear_cipher_ctx(SSL *s);
 int ssl_clear_bad_session(SSL *s);