1 files changed, 1 insertions, 40 deletions

diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index 9b60d664e5..3585a3ac55 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.111 2017/01/24 14:57:31 jsing Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.112 2017/01/26 06:32:58 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -125,55 +125,16 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *tick, int ticklen,
 
 SSL3_ENC_METHOD TLSv1_enc_data = {
         .enc = tls1_enc,
-        .mac = tls1_mac,
-        .setup_key_block = tls1_setup_key_block,
-        .generate_master_secret = tls1_generate_master_secret,
-        .change_cipher_state = tls1_change_cipher_state,
-        .final_finish_mac = tls1_final_finish_mac,
-        .finish_mac_length = TLS1_FINISH_MAC_LENGTH,
-        .cert_verify_mac = tls1_cert_verify_mac,
-        .client_finished_label = TLS_MD_CLIENT_FINISH_CONST,
-        .client_finished_label_len = TLS_MD_CLIENT_FINISH_CONST_SIZE,
-        .server_finished_label = TLS_MD_SERVER_FINISH_CONST,
-        .server_finished_label_len = TLS_MD_SERVER_FINISH_CONST_SIZE,
-        .alert_value = tls1_alert_code,
-        .export_keying_material = tls1_export_keying_material,
         .enc_flags = 0,
 };
 
 SSL3_ENC_METHOD TLSv1_1_enc_data = {
         .enc = tls1_enc,
-        .mac = tls1_mac,
-        .setup_key_block = tls1_setup_key_block,
-        .generate_master_secret = tls1_generate_master_secret,
-        .change_cipher_state = tls1_change_cipher_state,
-        .final_finish_mac = tls1_final_finish_mac,
-        .finish_mac_length = TLS1_FINISH_MAC_LENGTH,
-        .cert_verify_mac = tls1_cert_verify_mac,
-        .client_finished_label = TLS_MD_CLIENT_FINISH_CONST,
-        .client_finished_label_len = TLS_MD_CLIENT_FINISH_CONST_SIZE,
-        .server_finished_label = TLS_MD_SERVER_FINISH_CONST,
-        .server_finished_label_len = TLS_MD_SERVER_FINISH_CONST_SIZE,
-        .alert_value = tls1_alert_code,
-        .export_keying_material = tls1_export_keying_material,
         .enc_flags = SSL_ENC_FLAG_EXPLICIT_IV,
 };
 
 SSL3_ENC_METHOD TLSv1_2_enc_data = {
         .enc = tls1_enc,
-        .mac = tls1_mac,
-        .setup_key_block = tls1_setup_key_block,
-        .generate_master_secret = tls1_generate_master_secret,
-        .change_cipher_state = tls1_change_cipher_state,
-        .final_finish_mac = tls1_final_finish_mac,
-        .finish_mac_length = TLS1_FINISH_MAC_LENGTH,
-        .cert_verify_mac = tls1_cert_verify_mac,
-        .client_finished_label = TLS_MD_CLIENT_FINISH_CONST,
-        .client_finished_label_len = TLS_MD_CLIENT_FINISH_CONST_SIZE,
-        .server_finished_label = TLS_MD_SERVER_FINISH_CONST,
-        .server_finished_label_len = TLS_MD_SERVER_FINISH_CONST_SIZE,
-        .alert_value = tls1_alert_code,
-        .export_keying_material = tls1_export_keying_material,
         .enc_flags = SSL_ENC_FLAG_EXPLICIT_IV|SSL_ENC_FLAG_SIGALGS|
             SSL_ENC_FLAG_SHA256_PRF|SSL_ENC_FLAG_TLS1_2_CIPHERS,
 };