From c2e4e5d248567d4eea5bf6d525bdbcc09099ba6e Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 19 Jul 2016 19:42:11 +0200 Subject: Change all our uses of CRYPTO_THREAD_run_once to use RUN_ONCE instead That way, we have a way to check if the init function was successful or not. Reviewed-by: Kurt Roeckx --- crypto/init.c | 110 ++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 61 insertions(+), 49 deletions(-) (limited to 'crypto/init.c') diff --git a/crypto/init.c b/crypto/init.c index f38129fa20..ace11da610 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -22,6 +22,7 @@ #include #include #include +#include static int stopped = 0; @@ -61,7 +62,7 @@ static CRYPTO_RWLOCK *init_lock = NULL; static CRYPTO_ONCE base = CRYPTO_ONCE_STATIC_INIT; static int base_inited = 0; -static void ossl_init_base(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_base) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_base: Setting up stop handlers\n"); @@ -74,20 +75,22 @@ static void ossl_init_base(void) #ifndef OPENSSL_SYS_UEFI atexit(OPENSSL_cleanup); #endif - init_lock = CRYPTO_THREAD_lock_new(); + if ((init_lock = CRYPTO_THREAD_lock_new()) == NULL) + return 0; OPENSSL_cpuid_setup(); base_inited = 1; + return 1; } static CRYPTO_ONCE load_crypto_strings = CRYPTO_ONCE_STATIC_INIT; static int load_crypto_strings_inited = 0; -static void ossl_init_no_load_crypto_strings(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_no_load_crypto_strings) { /* Do nothing in this case */ - return; + return 1; } -static void ossl_init_load_crypto_strings(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_strings) { /* * OPENSSL_NO_AUTOERRINIT is provided here to prevent at compile time @@ -101,10 +104,11 @@ static void ossl_init_load_crypto_strings(void) err_load_crypto_strings_int(); #endif load_crypto_strings_inited = 1; + return 1; } static CRYPTO_ONCE add_all_ciphers = CRYPTO_ONCE_STATIC_INIT; -static void ossl_init_add_all_ciphers(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_add_all_ciphers) { /* * OPENSSL_NO_AUTOALGINIT is provided here to prevent at compile time @@ -117,10 +121,11 @@ static void ossl_init_add_all_ciphers(void) # endif openssl_add_all_ciphers_int(); #endif + return 1; } static CRYPTO_ONCE add_all_digests = CRYPTO_ONCE_STATIC_INIT; -static void ossl_init_add_all_digests(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_add_all_digests) { /* * OPENSSL_NO_AUTOALGINIT is provided here to prevent at compile time @@ -133,18 +138,19 @@ static void ossl_init_add_all_digests(void) # endif openssl_add_all_digests_int(); #endif + return 1; } -static void ossl_init_no_add_algs(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_no_add_algs) { /* Do nothing */ - return; + return 1; } static CRYPTO_ONCE config = CRYPTO_ONCE_STATIC_INIT; static int config_inited = 0; static const char *appname; -static void ossl_init_config(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_config) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, @@ -153,8 +159,9 @@ static void ossl_init_config(void) #endif openssl_config_int(appname); config_inited = 1; + return 1; } -static void ossl_init_no_config(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_no_config) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, @@ -162,103 +169,114 @@ static void ossl_init_no_config(void) #endif openssl_no_config_int(); config_inited = 1; + return 1; } static CRYPTO_ONCE async = CRYPTO_ONCE_STATIC_INIT; static int async_inited = 0; -static void ossl_init_async(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_async) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_async: async_init()\n"); #endif - async_init(); + if (!async_init()) + return 0; async_inited = 1; + return 1; } #ifndef OPENSSL_NO_ENGINE static CRYPTO_ONCE engine_openssl = CRYPTO_ONCE_STATIC_INIT; -static void ossl_init_engine_openssl(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_engine_openssl) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_openssl: " "engine_load_openssl_int()\n"); # endif engine_load_openssl_int(); + return 1; } # if !defined(OPENSSL_NO_HW) && \ (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)) static CRYPTO_ONCE engine_cryptodev = CRYPTO_ONCE_STATIC_INIT; -static void ossl_init_engine_cryptodev(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_engine_cryptodev) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_cryptodev: " "engine_load_cryptodev_int()\n"); # endif engine_load_cryptodev_int(); + return 1; } # endif # ifndef OPENSSL_NO_RDRAND static CRYPTO_ONCE engine_rdrand = CRYPTO_ONCE_STATIC_INIT; -static void ossl_init_engine_rdrand(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_engine_rdrand) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_rdrand: " "engine_load_rdrand_int()\n"); # endif engine_load_rdrand_int(); + return 1; } # endif static CRYPTO_ONCE engine_dynamic = CRYPTO_ONCE_STATIC_INIT; -static void ossl_init_engine_dynamic(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_engine_dynamic) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dynamic: " "engine_load_dynamic_int()\n"); # endif engine_load_dynamic_int(); + return 1; } # ifndef OPENSSL_NO_STATIC_ENGINE # if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK) static CRYPTO_ONCE engine_padlock = CRYPTO_ONCE_STATIC_INIT; -static void ossl_init_engine_padlock(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_engine_padlock) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_padlock: " "engine_load_padlock_int()\n"); # endif engine_load_padlock_int(); + return 1; } # endif # if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) static CRYPTO_ONCE engine_capi = CRYPTO_ONCE_STATIC_INIT; -static void ossl_init_engine_capi(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_engine_capi) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_capi: " "engine_load_capi_int()\n"); # endif engine_load_capi_int(); + return 1; } # endif static CRYPTO_ONCE engine_dasync = CRYPTO_ONCE_STATIC_INIT; -static void ossl_init_engine_dasync(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_engine_dasync) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dasync: " "engine_load_dasync_int()\n"); # endif engine_load_dasync_int(); + return 1; } # if !defined(OPENSSL_NO_AFALGENG) static CRYPTO_ONCE engine_afalg = CRYPTO_ONCE_STATIC_INIT; -static void ossl_init_engine_afalg(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_engine_afalg) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_afalg: " "engine_load_afalg_int()\n"); # endif engine_load_afalg_int(); + return 1; } # endif # endif @@ -268,10 +286,11 @@ static void ossl_init_engine_afalg(void) static CRYPTO_ONCE zlib = CRYPTO_ONCE_STATIC_INIT; static int zlib_inited = 0; -static void ossl_init_zlib(void) +DEFINE_RUN_ONCE_STATIC(ossl_init_zlib) { /* Do nothing - we need to know about this for the later cleanup */ zlib_inited = 1; + return 1; } #endif @@ -464,94 +483,87 @@ int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) return 0; } - if (!CRYPTO_THREAD_run_once(&base, ossl_init_base)) + if (!RUN_ONCE(&base, ossl_init_base)) return 0; if ((opts & OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS) - && !CRYPTO_THREAD_run_once(&load_crypto_strings, - ossl_init_no_load_crypto_strings)) + && !RUN_ONCE(&load_crypto_strings, + ossl_init_no_load_crypto_strings)) return 0; if ((opts & OPENSSL_INIT_LOAD_CRYPTO_STRINGS) - && !CRYPTO_THREAD_run_once(&load_crypto_strings, - ossl_init_load_crypto_strings)) + && !RUN_ONCE(&load_crypto_strings, ossl_init_load_crypto_strings)) return 0; if ((opts & OPENSSL_INIT_NO_ADD_ALL_CIPHERS) - && !CRYPTO_THREAD_run_once(&add_all_ciphers, ossl_init_no_add_algs)) + && !RUN_ONCE(&add_all_ciphers, ossl_init_no_add_algs)) return 0; if ((opts & OPENSSL_INIT_ADD_ALL_CIPHERS) - && !CRYPTO_THREAD_run_once(&add_all_ciphers, - ossl_init_add_all_ciphers)) + && !RUN_ONCE(&add_all_ciphers, ossl_init_add_all_ciphers)) return 0; if ((opts & OPENSSL_INIT_NO_ADD_ALL_DIGESTS) - && !CRYPTO_THREAD_run_once(&add_all_digests, ossl_init_no_add_algs)) + && !RUN_ONCE(&add_all_digests, ossl_init_no_add_algs)) return 0; if ((opts & OPENSSL_INIT_ADD_ALL_DIGESTS) - && !CRYPTO_THREAD_run_once(&add_all_digests, - ossl_init_add_all_digests)) + && !RUN_ONCE(&add_all_digests, ossl_init_add_all_digests)) return 0; if ((opts & OPENSSL_INIT_NO_LOAD_CONFIG) - && !CRYPTO_THREAD_run_once(&config, ossl_init_no_config)) + && !RUN_ONCE(&config, ossl_init_no_config)) return 0; if (opts & OPENSSL_INIT_LOAD_CONFIG) { int ret; CRYPTO_THREAD_write_lock(init_lock); appname = (settings == NULL) ? NULL : settings->appname; - ret = CRYPTO_THREAD_run_once(&config, ossl_init_config); + ret = RUN_ONCE(&config, ossl_init_config); CRYPTO_THREAD_unlock(init_lock); if (!ret) return 0; } if ((opts & OPENSSL_INIT_ASYNC) - && !CRYPTO_THREAD_run_once(&async, ossl_init_async)) + && !RUN_ONCE(&async, ossl_init_async)) return 0; #ifndef OPENSSL_NO_ENGINE if ((opts & OPENSSL_INIT_ENGINE_OPENSSL) - && !CRYPTO_THREAD_run_once(&engine_openssl, - ossl_init_engine_openssl)) + && !RUN_ONCE(&engine_openssl, ossl_init_engine_openssl)) return 0; # if !defined(OPENSSL_NO_HW) && \ (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)) if ((opts & OPENSSL_INIT_ENGINE_CRYPTODEV) - && !CRYPTO_THREAD_run_once(&engine_cryptodev, - ossl_init_engine_cryptodev)) + && !RUN_ONCE(&engine_cryptodev, ossl_init_engine_cryptodev)) return 0; # endif # ifndef OPENSSL_NO_RDRAND if ((opts & OPENSSL_INIT_ENGINE_RDRAND) - && !CRYPTO_THREAD_run_once(&engine_rdrand, ossl_init_engine_rdrand)) + && !RUN_ONCE(&engine_rdrand, ossl_init_engine_rdrand)) return 0; # endif if ((opts & OPENSSL_INIT_ENGINE_DYNAMIC) - && !CRYPTO_THREAD_run_once(&engine_dynamic, - ossl_init_engine_dynamic)) + && !RUN_ONCE(&engine_dynamic, ossl_init_engine_dynamic)) return 0; # 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)) + && !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)) + && !RUN_ONCE(&engine_capi, ossl_init_engine_capi)) return 0; # endif if ((opts & OPENSSL_INIT_ENGINE_DASYNC) - && !CRYPTO_THREAD_run_once(&engine_dasync, ossl_init_engine_dasync)) + && !RUN_ONCE(&engine_dasync, ossl_init_engine_dasync)) return 0; # if !defined(OPENSSL_NO_AFALGENG) if ((opts & OPENSSL_INIT_ENGINE_AFALG) - && !CRYPTO_THREAD_run_once(&engine_afalg, ossl_init_engine_afalg)) + && !RUN_ONCE(&engine_afalg, ossl_init_engine_afalg)) return 0; # endif # endif @@ -564,7 +576,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)) + && !RUN_ONCE(&zlib, ossl_init_zlib)) return 0; #endif -- cgit v1.2.3