diff options
| author | Emilia Kasper <emilia@openssl.org> | 2016-03-15 15:37:51 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-15 17:59:09 +0100 |
| commit | 3ddd1d0458b4e90d34379a3019f092d6010e9710 (patch) | |
| tree | 4c23f82bb96ec7bd590810e20015e8de3f9783a7 | |
| parent | Cygwin configs were missing thread_scheme settings, add them (diff) | |
| download | openssl-3ddd1d0458b4e90d34379a3019f092d6010e9710.tar.xz openssl-3ddd1d0458b4e90d34379a3019f092d6010e9710.zip | |
Fix CRYPTO_THREAD_run_once return value checks
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rw-r--r-- | crypto/init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/init.c b/crypto/init.c index b7e023592d..8c599894ba 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -594,13 +594,13 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) # ifndef OPENSSL_NO_STATIC_ENGINE # if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK) if ((opts & OPENSSL_INIT_ENGINE_PADLOCK) - && CRYPTO_THREAD_run_once(&engine_padlock, - ossl_init_engine_padlock)) + && !CRYPTO_THREAD_run_once(&engine_padlock, + ossl_init_engine_padlock)) return 0; # endif # if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) if ((opts & OPENSSL_INIT_ENGINE_CAPI) - && CRYPTO_THREAD_run_once(&engine_capi, ossl_init_engine_capi)) + && !CRYPTO_THREAD_run_once(&engine_capi, ossl_init_engine_capi)) return 0; # endif if ((opts & OPENSSL_INIT_ENGINE_DASYNC) @@ -621,7 +621,7 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) #ifndef OPENSSL_NO_COMP if ((opts & OPENSSL_INIT_ZLIB) - && CRYPTO_THREAD_run_once(&zlib, ossl_init_zlib)) + && !CRYPTO_THREAD_run_once(&zlib, ossl_init_zlib)) return 0; #endif |