*
*/
-#include <openssl/e_os2.h>
-
-#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 <internal/cryptlib_int.h>
#include <openssl/err.h>
#include <openssl/evp.h>
#include <openssl/comp.h>
#include <internal/err.h>
#include <stdlib.h>
+#include <assert.h>
+
+static int stopped = 0;
static void ossl_init_thread_stop(struct thread_local_inits_st *locals);
#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))
{
}
static struct thread_local_inits_st *local = NULL;
-void *ossl_init_get_thread_local(int alloc)
+static struct thread_local_inits_st *ossl_init_get_thread_local(int alloc)
{
+ static struct thread_local_inits_st *tmp;
+
+ tmp = local;
+
if (local == NULL && alloc)
- local = OPENSSL_zalloc(sizeof(*local));
- return local;
+ tmp = local = OPENSSL_zalloc(sizeof(*local));
+
+ if (!alloc)
+ local = NULL;
+
+ return tmp;
}
#elif defined(OPENSSL_SYS_WINDOWS)
*/
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
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)
{
}
# endif
-DWORD threadstopkey = TLS_OUT_OF_INDEXES;
+static DWORD threadstopkey = TLS_OUT_OF_INDEXES;
static int ossl_init_setup_thread_stop(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 = TlsGetValue(threadstopkey);
local = OPENSSL_zalloc(sizeof *local);
TlsSetValue(threadstopkey, local);
}
+ if (!alloc) {
+ TlsSetValue(threadstopkey, NULL);
+ }
return local;
}
#else /* pthreads */
# include <pthread.h>
-pthread_key_t threadstopkey;
+static 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))
{
{
}
-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);
local = OPENSSL_zalloc(sizeof *local);
pthread_setspecific(threadstopkey, local);
}
+ if (!alloc) {
+ pthread_setspecific(threadstopkey, NULL);
+ }
return local;
}
{
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.
"COMP_zlib_cleanup()\n");
#endif
COMP_zlib_cleanup();
- zlib_inited = 0;
- OPENSSL_INIT_ONCE_DYNAMIC_INIT(&zlib);
}
#ifndef OPENSSL_NO_ENGINE
"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);
-# endif
}
#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");
#endif
ERR_free_strings();
- load_crypto_strings_inited = 0;
- OPENSSL_INIT_ONCE_DYNAMIC_INIT(&load_crypto_strings);
}
- if (base_inited) {
#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_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");
#endif
- CRYPTO_cleanup_all_ex_data();
- EVP_cleanup();
- CONF_modules_free();
- RAND_cleanup();
- base_inited = 0;
- OPENSSL_INIT_ONCE_DYNAMIC_INIT(&base);
- }
+ CRYPTO_cleanup_all_ex_data();
+ EVP_cleanup();
+ CONF_modules_free();
+ RAND_cleanup();
+ base_inited = 0;
}
static const OPENSSL_INIT_SETTINGS *ossl_init_get_setting(
void OPENSSL_INIT_crypto_library_start(uint64_t opts,
const OPENSSL_INIT_SETTINGS *settings)
{
+ /* XXX TODO WARNING To be updated to return a value not assert. */
+ assert(!stopped);
+
ossl_init_once_run(&base, ossl_init_base);
if (opts & OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS)
projects / openssl.git / blobdiff