#include <internal/threads.h>
#include <internal/cryptlib_int.h>
#include <openssl/err.h>
-#include <openssl/rand.h>
+#include <internal/rand.h>
+#include <internal/bio.h>
#include <openssl/evp.h>
#include <internal/evp_int.h>
#include <internal/conf.h>
#include <internal/async.h>
-#ifndef OPENSSL_NO_ENGINE
#include <internal/engine.h>
-#endif
-#include <openssl/comp.h>
+#include <internal/comp.h>
#include <internal/err.h>
+#include <internal/err_int.h>
+#include <internal/objects.h>
#include <stdlib.h>
#include <assert.h>
static void ossl_init_thread_stop(struct thread_local_inits_st *locals);
-/* Implement "once" functionality */
-#if !defined(OPENSSL_THREADS)
-
-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;
-static struct thread_local_inits_st *ossl_init_get_thread_local(int alloc)
-{
- struct thread_local_inits_st *tmp;
-
- tmp = local;
-
- if (local == NULL && alloc)
- tmp = local = OPENSSL_zalloc(sizeof(*local));
-
- if (!alloc)
- local = NULL;
-
- return tmp;
-}
-
-#elif defined(OPENSSL_SYS_WINDOWS)
-
-# include <windows.h>
-
-static 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);
- }
-}
-
-static struct thread_local_inits_st *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);
- }
- if (!alloc) {
- TlsSetValue(threadstopkey, NULL);
- }
-
- return local;
-}
-
-#else /* pthreads */
-# include <pthread.h>
-
-static pthread_key_t threadstopkey;
+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)
-{
-}
-
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) {
- pthread_setspecific(threadstopkey, NULL);
+ 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);
};
static OPENSSL_INIT_STOP *stop_handlers = NULL;
+static CRYPTO_RWLOCK *init_lock = NULL;
static CRYPTO_ONCE base = CRYPTO_ONCE_STATIC_INIT;
static int base_inited = 0;
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_base: Setting up stop handlers\n");
#endif
- ossl_init_setup_thread_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;
}
#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;
}
#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();
#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();
{
#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;
}
-#ifndef OPENSSL_NO_ASYNC
static CRYPTO_ONCE async = CRYPTO_ONCE_STATIC_INIT;
static int async_inited = 0;
static void ossl_init_async(void)
async_init();
async_inited = 1;
}
-#endif
#ifndef OPENSSL_NO_ENGINE
-static int engine_inited = 0;
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))
{
# 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
{
# 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 CRYPTO_ONCE engine_dynamic = CRYPTO_ONCE_STATIC_INIT;
{
# 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)
{
# 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)
{
# 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 CRYPTO_ONCE engine_dasync = CRYPTO_ONCE_STATIC_INIT;
{
# 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 OPENSSL_INIT_ONCE engine_afalg = OPENSSL_INIT_ONCE_STATIC_INIT;
+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_internal()\n");
+ "engine_load_afalg_int()\n");
# endif
- engine_load_afalg_internal();
- engine_inited = 1;
+ engine_load_afalg_int();
}
# endif
# endif
#endif
+#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
static void ossl_init_thread_stop(struct thread_local_inits_st *locals)
{
if (locals == NULL)
return;
-#ifndef OPENSSL_NO_ASYNC
if (locals->async) {
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_thread_stop: "
#endif
ASYNC_cleanup_thread();
}
-#endif
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);
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_cleanup: "
- "COMP_zlib_cleanup()\n");
+ "comp_zlib_cleanup_int()\n");
#endif
- COMP_zlib_cleanup();
+ comp_zlib_cleanup_int();
}
+#endif
-#ifndef OPENSSL_NO_ASYNC
if (async_inited) {
# ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
# endif
async_deinit();
}
-#endif
-
-#ifndef OPENSSL_NO_ENGINE
- if (engine_inited) {
-# ifdef OPENSSL_INIT_DEBUG
- fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "ENGINE_cleanup()\n");
-# endif
- ENGINE_cleanup();
- }
-#endif
if (load_crypto_strings_inited) {
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: OPENSSL_cleanup: "
- "ERR_free_strings()\n");
+ "err_free_strings_int()\n");
#endif
- ERR_free_strings();
+ err_free_strings_int();
}
- ossl_init_thread_stop_cleanup();
+ 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();
+ 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();
+
base_inited = 0;
}
if (opts & OPENSSL_INIT_LOAD_CONFIG) {
int ret;
- CRYPTO_w_lock(CRYPTO_LOCK_INIT);
+ CRYPTO_THREAD_write_lock(init_lock);
config_filename = (settings == NULL) ? NULL : settings->config_name;
ret = CRYPTO_THREAD_run_once(&config, ossl_init_config);
- CRYPTO_w_unlock(CRYPTO_LOCK_INIT);
+ CRYPTO_THREAD_unlock(init_lock);
if (!ret)
return 0;
}
-#ifndef OPENSSL_NO_ASYNC
if ((opts & OPENSSL_INIT_ASYNC)
&& !CRYPTO_THREAD_run_once(&async, ossl_init_async))
return 0;
-#endif
+
#ifndef OPENSSL_NO_ENGINE
if ((opts & OPENSSL_INIT_ENGINE_OPENSSL)
&& !CRYPTO_THREAD_run_once(&engine_openssl,
# 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)
}
#endif
+#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
return 1;
}
return 1;
}
-
-
projects / openssl.git / blobdiff