commit 600fdc716f795674df68b487ab6e7b31165be4a0
author Dr. Stephen Henson <steve@openssl.org> Fri Nov 27 21:26:36 2015 +0000
committer Dr. Stephen Henson <steve@openssl.org> Fri Nov 27 21:28:23 2015 +0000
tree 5950806c9329117eb6883823a4567fcb09848f33
parent 28ba2541f9f5e61ddef548d3bead494ff6946db2

fix function code discrepancy

Reviewed-by: Matt Caswell <matt@openssl.org>

include/openssl/ssl.h

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 1fd9bc8..c959156 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2016,7 +2016,7 @@
 # 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

ssl/s3_enc.c

diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c
index bb900e9..850f76d 100644
--- a/ssl/s3_enc.c
+++ b/ssl/s3_enc.c
@@ -528,7 +528,7 @@
         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 @@
                                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;
     }
 

ssl/ssl_err.c

diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 642beae..1ecb91b 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -164,7 +164,7 @@
      "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"},