From 600fdc716f795674df68b487ab6e7b31165be4a0 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 27 Nov 2015 21:26:36 +0000 Subject: [PATCH] fix function code discrepancy Reviewed-by: Matt Caswell --- include/openssl/ssl.h | 2 +- ssl/s3_enc.c | 4 ++-- ssl/ssl_err.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 1fd9bc8e07..c959156362 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -2016,7 +2016,7 @@ void ERR_load_SSL_strings(void); # define SSL_F_SSL3_GET_SERVER_CERTIFICATE 144 # define SSL_F_SSL3_GET_SERVER_DONE 145 # define SSL_F_SSL3_GET_SERVER_HELLO 146 -# define SSL_F_SSL3_HANDSHAKE_MAC 285 +# define SSL_F_SSL3_FINAL_FINISH_MAC 285 # define SSL_F_SSL3_NEW_SESSION_TICKET 287 # define SSL_F_SSL3_OUTPUT_CERT_CHAIN 147 # define SSL_F_SSL3_PEEK 235 diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index bb900e9ca8..850f76d12d 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -528,7 +528,7 @@ int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p) return 0; if (EVP_MD_CTX_type(s->s3->handshake_dgst) != NID_md5_sha1) { - SSLerr(SSL_F_SSL3_HANDSHAKE_MAC, SSL_R_NO_REQUIRED_DIGEST); + SSLerr(SSL_F_SSL3_FINAL_FINISH_MAC, SSL_R_NO_REQUIRED_DIGEST); return 0; } @@ -546,7 +546,7 @@ int ssl3_final_finish_mac(SSL *s, const char *sender, int len, unsigned char *p) s->session->master_key_length, s->session->master_key) <= 0 || EVP_DigestFinal_ex(&ctx, p, NULL) <= 0) { - SSLerr(SSL_F_SSL3_HANDSHAKE_MAC, ERR_R_INTERNAL_ERROR); + SSLerr(SSL_F_SSL3_FINAL_FINISH_MAC, ERR_R_INTERNAL_ERROR); ret = 0; } diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index 642beaee1c..1ecb91bfb7 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -164,7 +164,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { "ssl3_get_server_certificate"}, {ERR_FUNC(SSL_F_SSL3_GET_SERVER_DONE), "ssl3_get_server_done"}, {ERR_FUNC(SSL_F_SSL3_GET_SERVER_HELLO), "ssl3_get_server_hello"}, - {ERR_FUNC(SSL_F_SSL3_HANDSHAKE_MAC), "ssl3_handshake_mac"}, + {ERR_FUNC(SSL_F_SSL3_FINAL_FINISH_MAC), "ssl3_final_finish_mac"}, {ERR_FUNC(SSL_F_SSL3_NEW_SESSION_TICKET), "SSL3_NEW_SESSION_TICKET"}, {ERR_FUNC(SSL_F_SSL3_OUTPUT_CERT_CHAIN), "ssl3_output_cert_chain"}, {ERR_FUNC(SSL_F_SSL3_PEEK), "ssl3_peek"}, -- GitLab