[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  bbba0a7dffdf3332ee24251bf50e264e27979a51 (commit)
       via  340a282853abbc9a95bfe63f58e6451a271df5a6 (commit)
       via  384a5d25b152a1a7e5a8f0c63eba08ed727f4c55 (commit)
      from  ad72d9fdf7709ddb97a58d7d45d755e6e0504b96 (commit)


- Log -----------------------------------------------------------------
commit bbba0a7dffdf3332ee24251bf50e264e27979a51
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 19 11:50:42 2016 +0200

    make update
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 340a282853abbc9a95bfe63f58e6451a271df5a6
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 19 11:50:31 2016 +0200

    Fixup a few SSLerr calls in ssl/statem/
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 384a5d25b152a1a7e5a8f0c63eba08ed727f4c55
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jul 19 11:49:51 2016 +0200

    Fixup collision between SSL_F_TLS_PROCESS_SKE and SSL_F_TLS_PROCESS_CKE macros
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/ssl.h    | 14 ++++++++------
 ssl/ssl_err.c            |  4 ++++
 ssl/statem/statem_clnt.c |  2 +-
 ssl/statem/statem_srvr.c |  4 ++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 8dcd525..7cf8e51 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -2065,6 +2065,8 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_DTLS_GET_REASSEMBLED_MESSAGE               370
 # define SSL_F_DTLS_PROCESS_HELLO_VERIFY                  386
 # define SSL_F_OPENSSL_INIT_SSL                           342
+# define SSL_F_OSSL_STATEM_CLIENT_READ_TRANSITION         417
+# define SSL_F_OSSL_STATEM_SERVER_READ_TRANSITION         418
 # define SSL_F_READ_STATE_MACHINE                         352
 # define SSL_F_SSL3_CHANGE_CIPHER_STATE                   129
 # define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM              130
@@ -2228,12 +2230,12 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_TLS_PROCESS_CERT_STATUS                    362
 # define SSL_F_TLS_PROCESS_CERT_VERIFY                    379
 # define SSL_F_TLS_PROCESS_CHANGE_CIPHER_SPEC             363
-# define SSL_F_TLS_PROCESS_CKE_DHE                        404
-# define SSL_F_TLS_PROCESS_CKE_ECDHE                      405
-# define SSL_F_TLS_PROCESS_CKE_GOST                       406
-# define SSL_F_TLS_PROCESS_CKE_PSK_PREAMBLE               407
-# define SSL_F_TLS_PROCESS_CKE_RSA                        409
-# define SSL_F_TLS_PROCESS_CKE_SRP                        410
+# define SSL_F_TLS_PROCESS_CKE_DHE                        411
+# define SSL_F_TLS_PROCESS_CKE_ECDHE                      412
+# define SSL_F_TLS_PROCESS_CKE_GOST                       413
+# define SSL_F_TLS_PROCESS_CKE_PSK_PREAMBLE               414
+# define SSL_F_TLS_PROCESS_CKE_RSA                        415
+# define SSL_F_TLS_PROCESS_CKE_SRP                        416
 # define SSL_F_TLS_PROCESS_CLIENT_CERTIFICATE             380
 # define SSL_F_TLS_PROCESS_CLIENT_HELLO                   381
 # define SSL_F_TLS_PROCESS_CLIENT_KEY_EXCHANGE            382
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 5192168..34da5f2 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -47,6 +47,10 @@ static ERR_STRING_DATA SSL_str_functs[] = {
      "dtls_get_reassembled_message"},
     {ERR_FUNC(SSL_F_DTLS_PROCESS_HELLO_VERIFY), "dtls_process_hello_verify"},
     {ERR_FUNC(SSL_F_OPENSSL_INIT_SSL), "OPENSSL_init_ssl"},
+    {ERR_FUNC(SSL_F_OSSL_STATEM_CLIENT_READ_TRANSITION),
+     "ossl_statem_client_read_transition"},
+    {ERR_FUNC(SSL_F_OSSL_STATEM_SERVER_READ_TRANSITION),
+     "ossl_statem_server_read_transition"},
     {ERR_FUNC(SSL_F_READ_STATE_MACHINE), "read_state_machine"},
     {ERR_FUNC(SSL_F_SSL3_CHANGE_CIPHER_STATE), "ssl3_change_cipher_state"},
     {ERR_FUNC(SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM),
diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 60aecdb..bef2583 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -268,7 +268,7 @@ int ossl_statem_client_read_transition(SSL *s, int mt)
  err:
     /* No valid transition found */
     ssl3_send_alert(s, SSL3_AL_FATAL, SSL3_AD_UNEXPECTED_MESSAGE);
-    SSLerr(SSL_F_READ_STATE_MACHINE, SSL_R_UNEXPECTED_MESSAGE);
+    SSLerr(SSL_F_OSSL_STATEM_CLIENT_READ_TRANSITION, SSL_R_UNEXPECTED_MESSAGE);
     return 0;
 }
 
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index d38fc3a..a45acbd 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -113,7 +113,7 @@ int ossl_statem_server_read_transition(SSL *s, int mt)
                          */
                         ssl3_send_alert(s, SSL3_AL_FATAL,
                                         SSL3_AD_HANDSHAKE_FAILURE);
-                        SSLerr(SSL_F_READ_STATE_MACHINE,
+                        SSLerr(SSL_F_OSSL_STATEM_SERVER_READ_TRANSITION,
                                SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE);
                         return 0;
                     }
@@ -214,7 +214,7 @@ int ossl_statem_server_read_transition(SSL *s, int mt)
 
     /* No valid transition found */
     ssl3_send_alert(s, SSL3_AL_FATAL, SSL3_AD_UNEXPECTED_MESSAGE);
-    SSLerr(SSL_F_READ_STATE_MACHINE, SSL_R_UNEXPECTED_MESSAGE);
+    SSLerr(SSL_F_OSSL_STATEM_SERVER_READ_TRANSITION, SSL_R_UNEXPECTED_MESSAGE);
     return 0;
 }