From 4c31123bfcb6047a54310112b678b37e2a1bfec7 Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Sun, 8 Feb 2015 01:34:11 -0500 Subject: [PATCH] Remove finish_mac_length from SSL3_ENC_METHOD. It's unused. Change-Id: I234c19990758ad761a72d5b0abe404a8583705a7 Reviewed-on: https://boringssl-review.googlesource.com/3768 Reviewed-by: Adam Langley --- include/openssl/tls1.h | 2 -- ssl/d1_lib.c | 2 -- ssl/s3_lib.c | 1 - ssl/ssl_locl.h | 1 - ssl/t1_lib.c | 3 --- 5 files changed, 9 deletions(-) diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h index ef00b68a..9d89a712 100644 --- a/include/openssl/tls1.h +++ b/include/openssl/tls1.h @@ -689,8 +689,6 @@ OPENSSL_EXPORT int SSL_get_shared_sigalgs(SSL *s, int idx, int *psign, #define TLS_CT_RSA_FIXED_ECDH 65 #define TLS_CT_ECDSA_FIXED_ECDH 66 -#define TLS1_FINISH_MAC_LENGTH 12 - #define TLS_MD_MAX_CONST_SIZE 20 #define TLS_MD_CLIENT_FINISH_CONST "client finished" #define TLS_MD_CLIENT_FINISH_CONST_SIZE 15 diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c index 6d2f77f0..fd92fae0 100644 --- a/ssl/d1_lib.c +++ b/ssl/d1_lib.c @@ -92,7 +92,6 @@ const SSL3_ENC_METHOD DTLSv1_enc_data = { tls1_generate_master_secret, tls1_change_cipher_state, tls1_final_finish_mac, - TLS1_FINISH_MAC_LENGTH, tls1_cert_verify_mac, TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE, TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_FINISH_CONST_SIZE, @@ -111,7 +110,6 @@ const SSL3_ENC_METHOD DTLSv1_2_enc_data = { tls1_generate_master_secret, tls1_change_cipher_state, tls1_final_finish_mac, - TLS1_FINISH_MAC_LENGTH, tls1_cert_verify_mac, TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE, TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_FINISH_CONST_SIZE, diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 72a02d4f..1b342c0d 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -563,7 +563,6 @@ const SSL3_ENC_METHOD SSLv3_enc_data = { tls1_generate_master_secret, tls1_change_cipher_state, ssl3_final_finish_mac, - MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH, ssl3_cert_verify_mac, SSL3_MD_CLIENT_FINISHED_CONST, 4, SSL3_MD_SERVER_FINISHED_CONST, 4, diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 5cc1cfc5..9986bd32 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -571,7 +571,6 @@ struct ssl3_enc_method { int (*generate_master_secret)(SSL *, uint8_t *, const uint8_t *, size_t); int (*change_cipher_state)(SSL *, int); int (*final_finish_mac)(SSL *, const char *, int, uint8_t *); - int finish_mac_length; int (*cert_verify_mac)(SSL *, int, uint8_t *); const char *client_finished_label; int client_finished_label_len; diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 967dad75..20b8c997 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -133,7 +133,6 @@ const SSL3_ENC_METHOD TLSv1_enc_data = { tls1_generate_master_secret, tls1_change_cipher_state, tls1_final_finish_mac, - TLS1_FINISH_MAC_LENGTH, tls1_cert_verify_mac, TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE, TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_FINISH_CONST_SIZE, @@ -152,7 +151,6 @@ const SSL3_ENC_METHOD TLSv1_1_enc_data = { tls1_generate_master_secret, tls1_change_cipher_state, tls1_final_finish_mac, - TLS1_FINISH_MAC_LENGTH, tls1_cert_verify_mac, TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE, TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_FINISH_CONST_SIZE, @@ -171,7 +169,6 @@ const SSL3_ENC_METHOD TLSv1_2_enc_data = { tls1_generate_master_secret, tls1_change_cipher_state, tls1_final_finish_mac, - TLS1_FINISH_MAC_LENGTH, tls1_cert_verify_mac, TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE, TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_FINISH_CONST_SIZE,