[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  a4625290c37193f77a04e73899e1c2fe176c4991 (commit)
      from  330fad61af7323d5cf786fa76c7b31b4e4cac413 (commit)


- Log -----------------------------------------------------------------
commit a4625290c37193f77a04e73899e1c2fe176c4991
Author: Rich Salz <rsalz at akamai.com>
Date:   Wed Feb 10 15:20:48 2016 -0500

    After renaming init, update errors.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 crypto/cpt_err.c         | 3 +--
 crypto/init.c            | 3 +--
 include/openssl/crypto.h | 2 +-
 include/openssl/ssl.h    | 2 +-
 ssl/ssl_err.c            | 3 +--
 ssl/ssl_init.c           | 2 +-
 6 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/crypto/cpt_err.c b/crypto/cpt_err.c
index d1e4b33..e9a0a22 100644
--- a/crypto/cpt_err.c
+++ b/crypto/cpt_err.c
@@ -84,8 +84,7 @@ static ERR_STRING_DATA CRYPTO_str_functs[] = {
     {ERR_FUNC(CRYPTO_F_INT_DUP_EX_DATA), "INT_DUP_EX_DATA"},
     {ERR_FUNC(CRYPTO_F_INT_FREE_EX_DATA), "INT_FREE_EX_DATA"},
     {ERR_FUNC(CRYPTO_F_INT_NEW_EX_DATA), "INT_NEW_EX_DATA"},
-    {ERR_FUNC(CRYPTO_F_OPENSSL_INIT_CRYPTO_LIBRARY_START),
-     "OPENSSL_INIT_crypto_library_start"},
+    {ERR_FUNC(CRYPTO_F_OPENSSL_INIT_CRYPTO), "OPENSSL_init_crypto"},
     {ERR_FUNC(CRYPTO_F_OPENSSL_MEMDUP), "OPENSSL_MEMDUP"},
     {0, NULL}
 };
diff --git a/crypto/init.c b/crypto/init.c
index cb9d65a..e6dd084 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -638,8 +638,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
              * sets an error etc
              */
             stoperrset = 1;
-            CRYPTOerr(CRYPTO_F_OPENSSL_INIT_CRYPTO_LIBRARY_START,
-                      ERR_R_INIT_FAIL);
+            CRYPTOerr(CRYPTO_F_OPENSSL_INIT_CRYPTO, ERR_R_INIT_FAIL);
         }
         return 0;
     }
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 4199466..d68551d 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -628,7 +628,7 @@ void ERR_load_CRYPTO_strings(void);
 # define CRYPTO_F_INT_DUP_EX_DATA                         106
 # define CRYPTO_F_INT_FREE_EX_DATA                        107
 # define CRYPTO_F_INT_NEW_EX_DATA                         108
-# define CRYPTO_F_OPENSSL_INIT_CRYPTO_LIBRARY_START       116
+# define CRYPTO_F_OPENSSL_INIT_CRYPTO                     116
 # define CRYPTO_F_OPENSSL_MEMDUP                          114
 
 /* Reason codes. */
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index 87ea39c..c4b9826 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -1986,7 +1986,7 @@ void ERR_load_SSL_strings(void);
 # define SSL_F_DTLS_CONSTRUCT_HELLO_VERIFY_REQUEST        385
 # define SSL_F_DTLS_GET_REASSEMBLED_MESSAGE               370
 # define SSL_F_DTLS_PROCESS_HELLO_VERIFY                  386
-# define SSL_F_OPENSSL_INIT_SSL_LIBRARY_START             342
+# define SSL_F_OPENSSL_INIT_SSL                           342
 # define SSL_F_READ_STATE_MACHINE                         352
 # define SSL_F_SSL3_ADD_CERT_TO_BUF                       296
 # define SSL_F_SSL3_CALLBACK_CTRL                         233
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index 4dc8895..4570fbb 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -103,8 +103,7 @@ static ERR_STRING_DATA SSL_str_functs[] = {
     {ERR_FUNC(SSL_F_DTLS_GET_REASSEMBLED_MESSAGE),
      "dtls_get_reassembled_message"},
     {ERR_FUNC(SSL_F_DTLS_PROCESS_HELLO_VERIFY), "dtls_process_hello_verify"},
-    {ERR_FUNC(SSL_F_OPENSSL_INIT_SSL_LIBRARY_START),
-     "OPENSSL_INIT_ssl_library_start"},
+    {ERR_FUNC(SSL_F_OPENSSL_INIT_SSL), "OPENSSL_init_ssl"},
     {ERR_FUNC(SSL_F_READ_STATE_MACHINE), "read_state_machine"},
     {ERR_FUNC(SSL_F_SSL3_ADD_CERT_TO_BUF), "SSL3_ADD_CERT_TO_BUF"},
     {ERR_FUNC(SSL_F_SSL3_CALLBACK_CTRL), "ssl3_callback_ctrl"},
diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c
index e7fc63d..bf3cd23 100644
--- a/ssl/ssl_init.c
+++ b/ssl/ssl_init.c
@@ -311,7 +311,7 @@ int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
              * sets an error etc
              */
             stoperrset = 1;
-            SSLerr(SSL_F_OPENSSL_INIT_SSL_LIBRARY_START, ERR_R_INIT_FAIL);
+            SSLerr(SSL_F_OPENSSL_INIT_SSL, ERR_R_INIT_FAIL);
         }
         return 0;
     }