From: Richard Levitte <levitte@openssl.org>
Date: Tue, 19 Jul 2016 09:50:42 +0000 (+0200)
Subject: make update
X-Git-Tag: OpenSSL_1_1_0-pre6~172
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbba0a7dffdf3332ee24251bf50e264e27979a51;p=openssl

make update

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index cdb175a4bc..7cf8e510da 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
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 5192168e97..34da5f2c53 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),