X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Finit.c;h=48f74c496c0c73b9490fe2f8aca140cd122824e3;hp=53ed235699a1543c8874724aa2fe000fc3c9bf86;hb=a1f82f06399f6c3cbee2009a498f4e7e620b2330;hpb=7b9f8f7f03eda2faa1cdd42ed29a0b70e60eaf59 diff --git a/crypto/init.c b/crypto/init.c index 53ed235699..48f74c496c 100644 --- a/crypto/init.c +++ b/crypto/init.c @@ -55,222 +55,80 @@ * */ -#include - -#if defined(OPENSSL_SYS_WINDOWS) && !defined(_WIN32_WINNT) -/* - * We default to requiring Windows Vista, Windows Server 2008 or later. We can - * support lower versions if _WIN32_WINNT is explicity defined to something - * less - */ -# define _WIN32_WINNT 0x0600 -#endif - +#include #include #include +#include +#include #include #include #include #include #include -#include +#include #include +#include +#include #include +#include -/* Implement "once" functionality */ -#if !defined(OPENSSL_THREADS) -typedef int OPENSSL_INIT_ONCE; -# define OPENSSL_INIT_ONCE_STATIC_INIT 0 -# define OPENSSL_INIT_ONCE_DYNAMIC_INIT(once) (*(once) = 0) - -static void ossl_init_once_run(OPENSSL_INIT_ONCE *once, void (*init)(void)) -{ - if (*once == OPENSSL_INIT_ONCE_STATIC_INIT) { - *once = 1; - init(); - } -} - -static int ossl_init_setup_thread_stop(void) -{ - /* - * There are no threads to stop. Do nothing. - */ - return 1; -} - -static void ossl_init_thread_stop_cleanup(void) -{ -} - -static struct thread_local_inits_st *local = NULL; -void *ossl_init_get_thread_local(int alloc) -{ - if (local == NULL && alloc) - local = OPENSSL_zalloc(sizeof(*local)); - return local; -} - -#elif defined(OPENSSL_SYS_WINDOWS) +static int stopped = 0; -# include +static void ossl_init_thread_stop(struct thread_local_inits_st *locals); -# if _WIN32_WINNT < 0x0600 - -/* - * Versions before 0x0600 (Windows Vista, Windows Server 2008 or later) do not - * have InitOnceExecuteOnce, so we fall back to using a spinlock instead. - */ -typedef LONG OPENSSL_INIT_ONCE; -# define OPENSSL_INIT_ONCE_STATIC_INIT 0 -# define OPENSSL_INIT_ONCE_DYNAMIC_INIT(once) (*(once) = 0) - -# define ONCE_UNINITED 0 -# define ONCE_ININIT 1 -# define ONCE_DONE 2 - -static void ossl_init_once_run(OPENSSL_INIT_ONCE *once, void (*init)(void)) -{ - LONG volatile *lock = (LONG *)once; - LONG result; - - if (*lock == ONCE_DONE) - return; - - do { - result = InterlockedCompareExchange(lock, ONCE_ININIT, ONCE_UNINITED); - if (result == ONCE_UNINITED) { - init(); - *lock = ONCE_DONE; - return; - } - } while (result == ONCE_ININIT); -} - -# else - -typedef INIT_ONCE OPENSSL_INIT_ONCE; -# define OPENSSL_INIT_ONCE_STATIC_INIT INIT_ONCE_STATIC_INIT -# define OPENSSL_INIT_ONCE_DYNAMIC_INIT(once) \ - InitOnceInitialize((PINIT_ONCE)(once)) - -static BOOL CALLBACK once_cb(PINIT_ONCE once, PVOID initfp, PVOID *unused) -{ - void (*init)(void) = initfp; - - init(); - - return TRUE; -} - -static void ossl_init_once_run(OPENSSL_INIT_ONCE *once, void (*init)(void)) -{ - InitOnceExecuteOnce((INIT_ONCE *)once, once_cb, init, NULL); -} -# endif - -DWORD threadstopkey = TLS_OUT_OF_INDEXES; - -static int ossl_init_setup_thread_stop(void) -{ - /* - * We use a dummy thread local key here. We use the destructor to detect - * when the thread is going to stop - */ - threadstopkey = TlsAlloc(); - if (threadstopkey == TLS_OUT_OF_INDEXES) - return 0; - - return 1; -} - -static void ossl_init_thread_stop_cleanup(void) -{ - if (threadstopkey != TLS_OUT_OF_INDEXES) { - TlsFree(threadstopkey); - } -} - -void *ossl_init_get_thread_local(int alloc) -{ - struct thread_local_inits_st *local = TlsGetValue(threadstopkey); - - if (local == NULL && alloc) { - local = OPENSSL_zalloc(sizeof *local); - TlsSetValue(threadstopkey, local); - } - - return local; -} - -#else /* pthreads */ -# include - -pthread_key_t threadstopkey; - -typedef pthread_once_t OPENSSL_INIT_ONCE; -# define OPENSSL_INIT_ONCE_STATIC_INIT PTHREAD_ONCE_INIT -# define OPENSSL_INIT_ONCE_DYNAMIC_INIT(once) (*(once) = PTHREAD_ONCE_INIT) - -static void ossl_init_once_run(OPENSSL_INIT_ONCE *once, void (*init)(void)) -{ - pthread_once(once, init); -} +static CRYPTO_THREAD_LOCAL threadstopkey; static void ossl_init_thread_stop_wrap(void *local) { ossl_init_thread_stop((struct thread_local_inits_st *)local); } -static int ossl_init_setup_thread_stop(void) -{ - /* - * We use a dummy thread local key here. We use the destructor to detect - * when the thread is going to stop - */ - return (pthread_key_create(&threadstopkey, - ossl_init_thread_stop_wrap) == 0); -} - -static void ossl_init_thread_stop_cleanup(void) -{ -} - -void *ossl_init_get_thread_local(int alloc) +static struct thread_local_inits_st *ossl_init_get_thread_local(int alloc) { - struct thread_local_inits_st *local = pthread_getspecific(threadstopkey); + struct thread_local_inits_st *local = + CRYPTO_THREAD_get_local(&threadstopkey); if (local == NULL && alloc) { local = OPENSSL_zalloc(sizeof *local); - pthread_setspecific(threadstopkey, local); + CRYPTO_THREAD_set_local(&threadstopkey, local); + } + if (!alloc) { + CRYPTO_THREAD_set_local(&threadstopkey, NULL); } return local; } -#endif - +typedef struct ossl_init_stop_st OPENSSL_INIT_STOP; struct ossl_init_stop_st { void (*handler)(void); OPENSSL_INIT_STOP *next; }; static OPENSSL_INIT_STOP *stop_handlers = NULL; +static CRYPTO_RWLOCK *init_lock = NULL; -static OPENSSL_INIT_ONCE base = OPENSSL_INIT_ONCE_STATIC_INIT; +static CRYPTO_ONCE base = CRYPTO_ONCE_STATIC_INIT; static int base_inited = 0; static void ossl_init_base(void) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_base: Setting up stop handlers\n"); #endif - ossl_init_setup_thread_stop(); - atexit(OPENSSL_INIT_library_stop); + /* + * We use a dummy thread local key here. We use the destructor to detect + * when the thread is going to stop (where that feature is available) + */ + CRYPTO_THREAD_init_local(&threadstopkey, ossl_init_thread_stop_wrap); +#ifndef OPENSSL_SYS_UEFI + atexit(OPENSSL_cleanup); +#endif + init_lock = CRYPTO_THREAD_lock_new(); OPENSSL_cpuid_setup(); base_inited = 1; } -static OPENSSL_INIT_ONCE load_crypto_strings = OPENSSL_INIT_ONCE_STATIC_INIT; +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) { @@ -280,17 +138,21 @@ static void ossl_init_no_load_crypto_strings(void) static void ossl_init_load_crypto_strings(void) { -#ifndef OPENSSL_NO_ERR + /* + * OPENSSL_NO_AUTOERRINIT is provided here to prevent at compile time + * pulling in all the error strings during static linking + */ +#if !defined(OPENSSL_NO_ERR) && !defined(OPENSSL_NO_AUTOERRINIT) # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_load_crypto_strings: " - "err_load_crypto_strings_intern()\n"); + "err_load_crypto_strings_int()\n"); # endif - err_load_crypto_strings_intern(); + err_load_crypto_strings_int(); #endif load_crypto_strings_inited = 1; } -static OPENSSL_INIT_ONCE add_all_ciphers = OPENSSL_INIT_ONCE_STATIC_INIT; +static CRYPTO_ONCE add_all_ciphers = CRYPTO_ONCE_STATIC_INIT; static void ossl_init_add_all_ciphers(void) { /* @@ -300,9 +162,9 @@ static void ossl_init_add_all_ciphers(void) #ifndef OPENSSL_NO_AUTOALGINIT # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_add_all_ciphers: " - "openssl_add_all_ciphers_internal()\n"); + "openssl_add_all_ciphers_int()\n"); # endif - openssl_add_all_ciphers_internal(); + openssl_add_all_ciphers_int(); # ifndef OPENSSL_NO_ENGINE # if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) ENGINE_setup_bsd_cryptodev(); @@ -311,7 +173,7 @@ static void ossl_init_add_all_ciphers(void) #endif } -static OPENSSL_INIT_ONCE add_all_digests = OPENSSL_INIT_ONCE_STATIC_INIT; +static CRYPTO_ONCE add_all_digests = CRYPTO_ONCE_STATIC_INIT; static void ossl_init_add_all_digests(void) { /* @@ -321,9 +183,9 @@ static void ossl_init_add_all_digests(void) #ifndef OPENSSL_NO_AUTOALGINIT # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_add_all_digests: " - "openssl_add_all_digests_internal()\n"); + "openssl_add_all_digests()\n"); # endif - openssl_add_all_digests_internal(); + openssl_add_all_digests_int(); # ifndef OPENSSL_NO_ENGINE # if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV) ENGINE_setup_bsd_cryptodev(); @@ -338,30 +200,30 @@ static void ossl_init_no_add_algs(void) return; } -static OPENSSL_INIT_ONCE config = OPENSSL_INIT_ONCE_STATIC_INIT; +static CRYPTO_ONCE config = CRYPTO_ONCE_STATIC_INIT; static int config_inited = 0; static const char *config_filename; static void ossl_init_config(void) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, - "OPENSSL_INIT: ossl_init_config: openssl_config_internal(%s)\n", + "OPENSSL_INIT: ossl_init_config: openssl_config(%s)\n", config_filename==NULL?"NULL":config_filename); #endif - openssl_config_internal(config_filename); + openssl_config_int(config_filename); config_inited = 1; } static void ossl_init_no_config(void) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, - "OPENSSL_INIT: ossl_init_config: openssl_no_config_internal()\n"); + "OPENSSL_INIT: ossl_init_config: openssl_no_config_int()\n"); #endif - openssl_no_config_internal(); + openssl_no_config_int(); config_inited = 1; } -static OPENSSL_INIT_ONCE async = OPENSSL_INIT_ONCE_STATIC_INIT; +static CRYPTO_ONCE async = CRYPTO_ONCE_STATIC_INIT; static int async_inited = 0; static void ossl_init_async(void) { @@ -373,100 +235,106 @@ static void ossl_init_async(void) } #ifndef OPENSSL_NO_ENGINE -static int engine_inited = 0; -static OPENSSL_INIT_ONCE engine_openssl = OPENSSL_INIT_ONCE_STATIC_INIT; +static CRYPTO_ONCE engine_openssl = CRYPTO_ONCE_STATIC_INIT; static void ossl_init_engine_openssl(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_openssl: " - "engine_load_openssl_internal()\n"); + "engine_load_openssl_int()\n"); # endif - engine_load_openssl_internal(); - engine_inited = 1; + engine_load_openssl_int(); } # if !defined(OPENSSL_NO_HW) && \ (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)) -static OPENSSL_INIT_ONCE engine_cryptodev = OPENSSL_INIT_ONCE_STATIC_INIT; +static CRYPTO_ONCE engine_cryptodev = CRYPTO_ONCE_STATIC_INIT; static void ossl_init_engine_cryptodev(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_cryptodev: " - "engine_load_cryptodev_internal()\n"); + "engine_load_cryptodev_int()\n"); # endif - engine_load_cryptodev_internal(); - engine_inited = 1; + engine_load_cryptodev_int(); } # endif # ifndef OPENSSL_NO_RDRAND -static OPENSSL_INIT_ONCE engine_rdrand = OPENSSL_INIT_ONCE_STATIC_INIT; +static CRYPTO_ONCE engine_rdrand = CRYPTO_ONCE_STATIC_INIT; static void ossl_init_engine_rdrand(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_rdrand: " - "engine_load_rdrand_internal()\n"); + "engine_load_rdrand_int()\n"); # endif - engine_load_rdrand_internal(); - engine_inited = 1; + engine_load_rdrand_int(); } # endif -static OPENSSL_INIT_ONCE engine_dynamic = OPENSSL_INIT_ONCE_STATIC_INIT; +static CRYPTO_ONCE engine_dynamic = CRYPTO_ONCE_STATIC_INIT; static void ossl_init_engine_dynamic(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dynamic: " - "engine_load_dynamic_internal()\n"); + "engine_load_dynamic_int()\n"); # endif - engine_load_dynamic_internal(); - engine_inited = 1; + engine_load_dynamic_int(); } # ifndef OPENSSL_NO_STATIC_ENGINE # if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK) -static OPENSSL_INIT_ONCE engine_padlock = OPENSSL_INIT_ONCE_STATIC_INIT; +static CRYPTO_ONCE engine_padlock = CRYPTO_ONCE_STATIC_INIT; static void ossl_init_engine_padlock(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_padlock: " - "engine_load_padlock_internal()\n"); + "engine_load_padlock_int()\n"); # endif - engine_load_padlock_internal(); - engine_inited = 1; + engine_load_padlock_int(); } # endif # if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) -static OPENSSL_INIT_ONCE engine_capi = OPENSSL_INIT_ONCE_STATIC_INIT; +static CRYPTO_ONCE engine_capi = CRYPTO_ONCE_STATIC_INIT; static void ossl_init_engine_capi(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_capi: " - "engine_load_capi_internal()\n"); + "engine_load_capi_int()\n"); # endif - engine_load_capi_internal(); - engine_inited = 1; + engine_load_capi_int(); } # endif -static OPENSSL_INIT_ONCE engine_dasync = OPENSSL_INIT_ONCE_STATIC_INIT; +static CRYPTO_ONCE engine_dasync = CRYPTO_ONCE_STATIC_INIT; static void ossl_init_engine_dasync(void) { # ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_dasync: " - "engine_load_dasync_internal()\n"); + "engine_load_dasync_int()\n"); # endif - engine_load_dasync_internal(); - engine_inited = 1; + engine_load_dasync_int(); } +# if !defined(OPENSSL_NO_AFALGENG) +static CRYPTO_ONCE engine_afalg = CRYPTO_ONCE_STATIC_INIT; +static void ossl_init_engine_afalg(void) +{ +# ifdef OPENSSL_INIT_DEBUG + fprintf(stderr, "OPENSSL_INIT: ossl_init_engine_afalg: " + "engine_load_afalg_int()\n"); +# endif + engine_load_afalg_int(); +} +# endif # endif #endif -static OPENSSL_INIT_ONCE zlib = OPENSSL_INIT_ONCE_STATIC_INIT; +#ifndef OPENSSL_NO_COMP +static CRYPTO_ONCE zlib = CRYPTO_ONCE_STATIC_INIT; + static int zlib_inited = 0; static void ossl_init_zlib(void) { /* Do nothing - we need to know about this for the later cleanup */ zlib_inited = 1; } +#endif -void ossl_init_thread_stop(struct thread_local_inits_st *locals) +static void ossl_init_thread_stop(struct thread_local_inits_st *locals) { /* Can't do much about this */ if (locals == NULL) @@ -483,13 +351,18 @@ void ossl_init_thread_stop(struct thread_local_inits_st *locals) if (locals->err_state) { #ifdef OPENSSL_INIT_DEBUG fprintf(stderr, "OPENSSL_INIT: ossl_init_thread_stop: " - "ERR_remove_thread_state(NULL)\n"); + "ERR_remove_thread_state()\n"); #endif - ERR_remove_thread_state(NULL); + ERR_remove_thread_state(); } OPENSSL_free(locals); - ossl_init_thread_stop_cleanup(); +} + +void OPENSSL_thread_stop(void) +{ + ossl_init_thread_stop( + (struct thread_local_inits_st *)ossl_init_get_thread_local(0)); } int ossl_init_thread_start(uint64_t opts) @@ -518,10 +391,19 @@ int ossl_init_thread_start(uint64_t opts) return 1; } -void OPENSSL_INIT_library_stop(void) +void OPENSSL_cleanup(void) { OPENSSL_INIT_STOP *currhandler, *lasthandler; + /* If we've not been inited then no need to deinit */ + if (!base_inited) + return; + + /* Might be explicitly called and also by atexit */ + if (stopped) + return; + stopped = 1; + /* * Thread stop may not get automatically called by the thread library for * the very last thread in some situations, so call it directly. @@ -536,101 +418,87 @@ void OPENSSL_INIT_library_stop(void) OPENSSL_free(lasthandler); } stop_handlers = NULL; + + CRYPTO_THREAD_lock_free(init_lock); + /* * We assume we are single-threaded for this function, i.e. no race * conditions for the various "*_inited" vars below. */ +#ifndef OPENSSL_NO_COMP if (zlib_inited) { #ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " - "COMP_zlib_cleanup()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "comp_zlib_cleanup_int()\n"); #endif - COMP_zlib_cleanup(); - zlib_inited = 0; - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&zlib); + comp_zlib_cleanup_int(); } +#endif -#ifndef OPENSSL_NO_ENGINE - if (engine_inited) { + if (async_inited) { # ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " - "ENGINE_cleanup()\n"); -# endif - ENGINE_cleanup(); - engine_inited = 0; - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_openssl); -# if !defined(OPENSSL_NO_HW) && \ - (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)) - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_cryptodev); -# endif -# ifndef OPENSSL_NO_RDRAND - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_rdrand); -# endif - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_dynamic); -# ifndef OPENSSL_NO_STATIC_ENGINE -# if !defined(OPENSSL_NO_HW) && !defined(OPENSSL_NO_HW_PADLOCK) - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_padlock); -# endif -# if defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_CAPIENG) - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_capi); -# endif - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&engine_dasync); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "async_deinit()\n"); # endif + async_deinit(); } -#endif - - async_inited = 0; - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&async); - - config_inited = 0; - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&config); - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&add_all_ciphers); - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&add_all_digests); if (load_crypto_strings_inited) { #ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " - "ERR_free_strings()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "err_free_strings_int()\n"); #endif - ERR_free_strings(); - load_crypto_strings_inited = 0; - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&load_crypto_strings); + err_free_strings_int(); } - if (base_inited) { + CRYPTO_THREAD_cleanup_local(&threadstopkey); + #ifdef OPENSSL_INIT_DEBUG - fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " - "CRYPTO_cleanup_all_ex_data()\n"); - fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " - "EVP_cleanup()\n"); - fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " - "CONF_modules_free()\n"); - fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: " - "RAND_cleanup()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "rand_cleanup_int()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "conf_modules_free_int()\n"); +#ifndef OPENSSL_NO_ENGINE + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "engine_cleanup_int()\n"); #endif - CRYPTO_cleanup_all_ex_data(); - EVP_cleanup(); - CONF_modules_free(); - RAND_cleanup(); - base_inited = 0; - OPENSSL_INIT_ONCE_DYNAMIC_INIT(&base); - } -} - -static const OPENSSL_INIT_SETTINGS *ossl_init_get_setting( - const OPENSSL_INIT_SETTINGS *settings, int name) -{ - if (settings == NULL) - return NULL; - - while (settings->name != OPENSSL_INIT_SET_END) { - if (settings->name == name) - return settings; - settings++; - } + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "crypto_cleanup_all_ex_data_int()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "bio_sock_cleanup_int()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "bio_cleanup()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "evp_cleanup_int()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "obj_cleanup_int()\n"); + fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: " + "err_cleanup()\n"); +#endif + /* + * Note that cleanup order is important: + * - rand_cleanup_int could call an ENGINE's RAND cleanup function so + * must be called before engine_cleanup_int() + * - ENGINEs use CRYPTO_EX_DATA and therefore, must be cleaned up + * before the ex data handlers are wiped in CRYPTO_cleanup_all_ex_data(). + * - conf_modules_free_int() can end up in ENGINE code so must be called + * before engine_cleanup_int() + * - ENGINEs and additional EVP algorithms might use added OIDs names so + * obj_cleanup_int() must be called last + */ + rand_cleanup_int(); + conf_modules_free_int(); +#ifndef OPENSSL_NO_ENGINE + engine_cleanup_int(); +#endif + crypto_cleanup_all_ex_data_int(); + bio_cleanup(); + evp_cleanup_int(); + obj_cleanup_int(); + err_cleanup(); - return NULL; + base_inited = 0; } /* @@ -638,93 +506,131 @@ static const OPENSSL_INIT_SETTINGS *ossl_init_get_setting( * called prior to any threads making calls to any OpenSSL functions, * i.e. passing a non-null settings value is assumed to be single-threaded. */ -void OPENSSL_INIT_crypto_library_start(uint64_t opts, - const OPENSSL_INIT_SETTINGS *settings) -{ - ossl_init_once_run(&base, ossl_init_base); +int OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings) +{ + static int stoperrset = 0; + + if (stopped) { + if (!stoperrset) { + /* + * We only ever set this once to avoid getting into an infinite + * loop where the error system keeps trying to init and fails so + * sets an error etc + */ + stoperrset = 1; + CRYPTOerr(CRYPTO_F_OPENSSL_INIT_CRYPTO, ERR_R_INIT_FAIL); + } + return 0; + } - if (opts & OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS) - ossl_init_once_run(&load_crypto_strings, - ossl_init_no_load_crypto_strings); + if (!CRYPTO_THREAD_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)) + return 0; - if (opts & OPENSSL_INIT_LOAD_CRYPTO_STRINGS) - ossl_init_once_run(&load_crypto_strings, ossl_init_load_crypto_strings); + if ((opts & OPENSSL_INIT_LOAD_CRYPTO_STRINGS) + && !CRYPTO_THREAD_run_once(&load_crypto_strings, + ossl_init_load_crypto_strings)) + return 0; - if (opts & OPENSSL_INIT_NO_ADD_ALL_CIPHERS) - ossl_init_once_run(&add_all_ciphers, ossl_init_no_add_algs); + if ((opts & OPENSSL_INIT_NO_ADD_ALL_CIPHERS) + && !CRYPTO_THREAD_run_once(&add_all_ciphers, ossl_init_no_add_algs)) + return 0; - if (opts & OPENSSL_INIT_ADD_ALL_CIPHERS) - ossl_init_once_run(&add_all_ciphers, ossl_init_add_all_ciphers); + if ((opts & OPENSSL_INIT_ADD_ALL_CIPHERS) + && !CRYPTO_THREAD_run_once(&add_all_ciphers, + ossl_init_add_all_ciphers)) + return 0; - if (opts & OPENSSL_INIT_NO_ADD_ALL_DIGESTS) - ossl_init_once_run(&add_all_digests, ossl_init_no_add_algs); + if ((opts & OPENSSL_INIT_NO_ADD_ALL_DIGESTS) + && !CRYPTO_THREAD_run_once(&add_all_digests, ossl_init_no_add_algs)) + return 0; - if (opts & OPENSSL_INIT_ADD_ALL_DIGESTS) - ossl_init_once_run(&add_all_digests, ossl_init_add_all_digests); + if ((opts & OPENSSL_INIT_ADD_ALL_DIGESTS) + && !CRYPTO_THREAD_run_once(&add_all_digests, + ossl_init_add_all_digests)) + return 0; - if (opts & OPENSSL_INIT_NO_LOAD_CONFIG) { - ossl_init_once_run(&config, ossl_init_no_config); - } + if ((opts & OPENSSL_INIT_NO_LOAD_CONFIG) + && !CRYPTO_THREAD_run_once(&config, ossl_init_no_config)) + return 0; if (opts & OPENSSL_INIT_LOAD_CONFIG) { - if (settings != NULL) { - const OPENSSL_INIT_SETTINGS *curr; - curr = ossl_init_get_setting(settings, - OPENSSL_INIT_SET_CONF_FILENAME); - config_filename = curr == NULL ? NULL : curr->value.type_string; - } - ossl_init_once_run(&config, ossl_init_config); + int ret; + CRYPTO_THREAD_write_lock(init_lock); + config_filename = (settings == NULL) ? NULL : settings->config_name; + ret = CRYPTO_THREAD_run_once(&config, ossl_init_config); + CRYPTO_THREAD_unlock(init_lock); + if (!ret) + return 0; } - if (opts & OPENSSL_INIT_ASYNC) { - ossl_init_once_run(&async, ossl_init_async); - } + if ((opts & OPENSSL_INIT_ASYNC) + && !CRYPTO_THREAD_run_once(&async, ossl_init_async)) + return 0; #ifndef OPENSSL_NO_ENGINE - if (opts & OPENSSL_INIT_ENGINE_OPENSSL) { - ossl_init_once_run(&engine_openssl, ossl_init_engine_openssl); - } + if ((opts & OPENSSL_INIT_ENGINE_OPENSSL) + && !CRYPTO_THREAD_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) { - ossl_init_once_run(&engine_cryptodev, ossl_init_engine_cryptodev); - } + if ((opts & OPENSSL_INIT_ENGINE_CRYPTODEV) + && !CRYPTO_THREAD_run_once(&engine_cryptodev, + ossl_init_engine_cryptodev)) + return 0; # endif # ifndef OPENSSL_NO_RDRAND - if (opts & OPENSSL_INIT_ENGINE_RDRAND) { - ossl_init_once_run(&engine_rdrand, ossl_init_engine_rdrand); - } + if ((opts & OPENSSL_INIT_ENGINE_RDRAND) + && !CRYPTO_THREAD_run_once(&engine_rdrand, ossl_init_engine_rdrand)) + return 0; # endif - if (opts & OPENSSL_INIT_ENGINE_DYNAMIC) { - ossl_init_once_run(&engine_dynamic, ossl_init_engine_dynamic); - } + if ((opts & OPENSSL_INIT_ENGINE_DYNAMIC) + && !CRYPTO_THREAD_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) { - ossl_init_once_run(&engine_padlock, ossl_init_engine_padlock); - } + if ((opts & OPENSSL_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) { - ossl_init_once_run(&engine_capi, ossl_init_engine_capi); - } + if ((opts & OPENSSL_INIT_ENGINE_CAPI) + && !CRYPTO_THREAD_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)) + return 0; +# if !defined(OPENSSL_NO_AFALGENG) + if ((opts & OPENSSL_INIT_ENGINE_AFALG) + && !CRYPTO_THREAD_run_once(&engine_afalg, ossl_init_engine_afalg)) + return 0; # endif - if (opts & OPENSSL_INIT_ENGINE_DASYNC) { - ossl_init_once_run(&engine_dasync, ossl_init_engine_dasync); - } # endif if (opts & (OPENSSL_INIT_ENGINE_ALL_BUILTIN - | OPENSSL_INIT_ENGINE_DASYNC | OPENSSL_INIT_ENGINE_OPENSSL)) { + | OPENSSL_INIT_ENGINE_DASYNC | OPENSSL_INIT_ENGINE_OPENSSL + | OPENSSL_INIT_ENGINE_AFALG)) { ENGINE_register_all_complete(); } #endif - if (opts & OPENSSL_INIT_ZLIB) { - ossl_init_once_run(&zlib, ossl_init_zlib); - } +#ifndef OPENSSL_NO_COMP + if ((opts & OPENSSL_INIT_ZLIB) + && !CRYPTO_THREAD_run_once(&zlib, ossl_init_zlib)) + return 0; +#endif + + return 1; } -int OPENSSL_INIT_register_stop_handler(void (*handler)(void)) +int OPENSSL_atexit(void (*handler)(void)) { OPENSSL_INIT_STOP *newhand; @@ -738,5 +644,3 @@ int OPENSSL_INIT_register_stop_handler(void (*handler)(void)) return 1; } - -