generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix CRYPTO_THREAD_run_once return value checks

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Emilia Kasper
2016-03-15 15:37:51 +01:00
committed by Richard Levitte
parent e58d91027a
commit 3ddd1d0458
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/init.c
View File

@@ -594,13 +594,13 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings)
# ifndef OPENSSL_NO_STATIC_ENGINE # ifndef OPENSSL_NO_STATIC_ENGINE
# if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK) # if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK)
if ((opts & OPENSSL_INIT_ENGINE_PADLOCK) if ((opts & OPENSSL_INIT_ENGINE_PADLOCK)
&& CRYPTO_THREAD_run_once(&engine_padlock, && !CRYPTO_THREAD_run_once(&engine_padlock,
ossl_init_engine_padlock)) ossl_init_engine_padlock))
return 0; return 0;
# endif # endif
# if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) # if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG)
if ((opts & OPENSSL_INIT_ENGINE_CAPI) 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; return 0;
# endif # endif
if ((opts & OPENSSL_INIT_ENGINE_DASYNC) 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 #ifndef OPENSSL_NO_COMP
if ((opts & OPENSSL_INIT_ZLIB) if ((opts & OPENSSL_INIT_ZLIB)
&& CRYPTO_THREAD_run_once(&zlib, ossl_init_zlib)) && !CRYPTO_THREAD_run_once(&zlib, ossl_init_zlib))
return 0; return 0;
#endif #endif