diff options
| author | Matt Caswell <matt@openssl.org> | 2016-02-10 13:59:15 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-02-10 17:40:59 +0000 |
| commit | 0fc32b0718ec210e03b6d8623d4819ed04615a1b (patch) | |
| tree | 9491a02a740d05b415790bcfeb16eb65f6a06267 /include | |
| parent | 8bd8221be80708825ddb9771d4c9fff67860119b (diff) | |
The new init functions can now fail so shouldn't be void
The new init functions can fail if the library has already been stopped. We
should be able to indicate failure with a 0 return value.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/crypto.h | 2 | ||||
| -rw-r--r-- | include/openssl/err.h | 1 | ||||
| -rw-r--r-- | include/openssl/ssl.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 16b7fbdfaa..d6cedecd60 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -598,7 +598,7 @@ typedef struct ossl_init_stop_st OPENSSL_INIT_STOP; /* Library initialisation functions */ void OPENSSL_cleanup(void); -void OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); +int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); int OPENSSL_atexit(void (*handler)(void)); void OPENSSL_thread_stop(void); diff --git a/include/openssl/err.h b/include/openssl/err.h index 147d4da726..39f216c21c 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -309,6 +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) /* * 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 d65ee9f708..888f9a9c95 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1940,7 +1940,7 @@ __owur void *SSL_CTX_get0_security_ex_data(const SSL_CTX *ctx); #define OPENSSL_INIT_SSL_DEFAULT \ (OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS) -void OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); +int OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings); # ifndef OPENSSL_NO_UNIT_TEST __owur const struct openssl_ssl_test_functions *SSL_test_functions(void); |