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 /crypto/err | |
| 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 'crypto/err')
| -rw-r--r-- | crypto/err/err.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index d92e41e3e9..72656339c5 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -894,8 +894,9 @@ ERR_STATE *ERR_get_state(void) * the first one that we just replaced. */ ERR_STATE_free(tmpp); + + /* Ignore failures from these */ OPENSSL_init_crypto(OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL); - /* Ignore failures from this */ ossl_init_thread_start(OPENSSL_INIT_THREAD_ERR_STATE); } return ret; |