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 <agl@google.com>
This commit is contained in:
parent
f7f0f3a74b
commit
4c31123bfc
@ -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_RSA_FIXED_ECDH 65
|
||||||
#define TLS_CT_ECDSA_FIXED_ECDH 66
|
#define TLS_CT_ECDSA_FIXED_ECDH 66
|
||||||
|
|
||||||
#define TLS1_FINISH_MAC_LENGTH 12
|
|
||||||
|
|
||||||
#define TLS_MD_MAX_CONST_SIZE 20
|
#define TLS_MD_MAX_CONST_SIZE 20
|
||||||
#define TLS_MD_CLIENT_FINISH_CONST "client finished"
|
#define TLS_MD_CLIENT_FINISH_CONST "client finished"
|
||||||
#define TLS_MD_CLIENT_FINISH_CONST_SIZE 15
|
#define TLS_MD_CLIENT_FINISH_CONST_SIZE 15
|
||||||
|
@ -92,7 +92,6 @@ const SSL3_ENC_METHOD DTLSv1_enc_data = {
|
|||||||
tls1_generate_master_secret,
|
tls1_generate_master_secret,
|
||||||
tls1_change_cipher_state,
|
tls1_change_cipher_state,
|
||||||
tls1_final_finish_mac,
|
tls1_final_finish_mac,
|
||||||
TLS1_FINISH_MAC_LENGTH,
|
|
||||||
tls1_cert_verify_mac,
|
tls1_cert_verify_mac,
|
||||||
TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
||||||
TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_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_generate_master_secret,
|
||||||
tls1_change_cipher_state,
|
tls1_change_cipher_state,
|
||||||
tls1_final_finish_mac,
|
tls1_final_finish_mac,
|
||||||
TLS1_FINISH_MAC_LENGTH,
|
|
||||||
tls1_cert_verify_mac,
|
tls1_cert_verify_mac,
|
||||||
TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
||||||
TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_FINISH_CONST_SIZE,
|
TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_FINISH_CONST_SIZE,
|
||||||
|
@ -563,7 +563,6 @@ const SSL3_ENC_METHOD SSLv3_enc_data = {
|
|||||||
tls1_generate_master_secret,
|
tls1_generate_master_secret,
|
||||||
tls1_change_cipher_state,
|
tls1_change_cipher_state,
|
||||||
ssl3_final_finish_mac,
|
ssl3_final_finish_mac,
|
||||||
MD5_DIGEST_LENGTH+SHA_DIGEST_LENGTH,
|
|
||||||
ssl3_cert_verify_mac,
|
ssl3_cert_verify_mac,
|
||||||
SSL3_MD_CLIENT_FINISHED_CONST, 4,
|
SSL3_MD_CLIENT_FINISHED_CONST, 4,
|
||||||
SSL3_MD_SERVER_FINISHED_CONST, 4,
|
SSL3_MD_SERVER_FINISHED_CONST, 4,
|
||||||
|
@ -571,7 +571,6 @@ struct ssl3_enc_method {
|
|||||||
int (*generate_master_secret)(SSL *, uint8_t *, const uint8_t *, size_t);
|
int (*generate_master_secret)(SSL *, uint8_t *, const uint8_t *, size_t);
|
||||||
int (*change_cipher_state)(SSL *, int);
|
int (*change_cipher_state)(SSL *, int);
|
||||||
int (*final_finish_mac)(SSL *, const char *, int, uint8_t *);
|
int (*final_finish_mac)(SSL *, const char *, int, uint8_t *);
|
||||||
int finish_mac_length;
|
|
||||||
int (*cert_verify_mac)(SSL *, int, uint8_t *);
|
int (*cert_verify_mac)(SSL *, int, uint8_t *);
|
||||||
const char *client_finished_label;
|
const char *client_finished_label;
|
||||||
int client_finished_label_len;
|
int client_finished_label_len;
|
||||||
|
@ -133,7 +133,6 @@ const SSL3_ENC_METHOD TLSv1_enc_data = {
|
|||||||
tls1_generate_master_secret,
|
tls1_generate_master_secret,
|
||||||
tls1_change_cipher_state,
|
tls1_change_cipher_state,
|
||||||
tls1_final_finish_mac,
|
tls1_final_finish_mac,
|
||||||
TLS1_FINISH_MAC_LENGTH,
|
|
||||||
tls1_cert_verify_mac,
|
tls1_cert_verify_mac,
|
||||||
TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
||||||
TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_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_generate_master_secret,
|
||||||
tls1_change_cipher_state,
|
tls1_change_cipher_state,
|
||||||
tls1_final_finish_mac,
|
tls1_final_finish_mac,
|
||||||
TLS1_FINISH_MAC_LENGTH,
|
|
||||||
tls1_cert_verify_mac,
|
tls1_cert_verify_mac,
|
||||||
TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
||||||
TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_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_generate_master_secret,
|
||||||
tls1_change_cipher_state,
|
tls1_change_cipher_state,
|
||||||
tls1_final_finish_mac,
|
tls1_final_finish_mac,
|
||||||
TLS1_FINISH_MAC_LENGTH,
|
|
||||||
tls1_cert_verify_mac,
|
tls1_cert_verify_mac,
|
||||||
TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
TLS_MD_CLIENT_FINISH_CONST,TLS_MD_CLIENT_FINISH_CONST_SIZE,
|
||||||
TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_FINISH_CONST_SIZE,
|
TLS_MD_SERVER_FINISH_CONST,TLS_MD_SERVER_FINISH_CONST_SIZE,
|
||||||
|
Loading…
Reference in New Issue
Block a user