Commit a4625290 authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

After renaming init, update errors. 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 330fad61

crypto/cpt_err.c

+1 −2
Original line number Diff line number Diff line
@@ -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}

};

crypto/init.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

    }

include/openssl/crypto.h

+1 −1
Original line number Diff line number Diff line
@@ -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. */

include/openssl/ssl.h

+1 −1
Original line number Diff line number Diff line
@@ -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

ssl/ssl_err.c

+1 −2
Original line number Diff line number Diff line
@@ -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"},