diff options
| author | Matt Caswell <matt@openssl.org> | 2016-02-10 15:16:06 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-02-10 17:40:59 +0000 |
| commit | 302f75887e52bbe0ab7a5806335a0a1264323b07 (patch) | |
| tree | 704e3638b402a89e064f6cde7d893ad8b687581e /include | |
| parent | 0fc32b0718ec210e03b6d8623d4819ed04615a1b (diff) | |
| download | openssl-302f75887e52bbe0ab7a5806335a0a1264323b07.tar.gz | |
Attempt to log an error if init failed
If init failed we'd like to set an error code to indicate that. But if
init failed then when the error system tries to load its strings its going
to fail again. We could get into an infinite loop. Therefore we just set
a single error the first time around. After that no error is set.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/crypto.h | 1 | ||||
| -rw-r--r-- | include/openssl/err.h | 2 | ||||
| -rw-r--r-- | include/openssl/ssl.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index d6cedecd60..d761a97f7f 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -627,6 +627,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_MEMDUP 114 /* Reason codes. */ diff --git a/include/openssl/err.h b/include/openssl/err.h index 39f216c21c..bdf83081cb 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -309,7 +309,7 @@ typedef struct err_state_st { # define ERR_R_PASSED_NULL_PARAMETER (3|ERR_R_FATAL) # define ERR_R_INTERNAL_ERROR (4|ERR_R_FATAL) # define ERR_R_DISABLED (5|ERR_R_FATAL) -# define ERR_R_NOT_INITED (6|ERR_R_FATAL) +# define ERR_R_INIT_FAIL (6|ERR_R_FATAL) /* * 99 is the maximum possible ERR_R_... code, higher values are reserved for diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index 888f9a9c95..87ea39cd08 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1986,6 +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_READ_STATE_MACHINE 352 # define SSL_F_SSL3_ADD_CERT_TO_BUF 296 # define SSL_F_SSL3_CALLBACK_CTRL 233 |