if (local == NULL && alloc) {
local = OPENSSL_zalloc(sizeof *local);
- CRYPTO_THREAD_set_local(&threadstopkey, local);
+ if (local != NULL && !CRYPTO_THREAD_set_local(&threadstopkey, local)) {
+ OPENSSL_free(local);
+ return NULL;
+ }
}
if (!alloc) {
CRYPTO_THREAD_set_local(&threadstopkey, NULL);
{
#ifdef OPENSSL_INIT_DEBUG
fprintf(stderr, "OPENSSL_INIT: ossl_init_base: Setting up stop handlers\n");
+#endif
+#ifndef OPENSSL_NO_CRYPTO_MDEBUG
+ ossl_malloc_setup_failures();
#endif
/*
* We use a dummy thread local key here. We use the destructor to detect
if ((init_lock = CRYPTO_THREAD_lock_new()) == NULL)
return 0;
OPENSSL_cpuid_setup();
+
+ /*
+ * BIG FAT WARNING!
+ * Everything needed to be initialized in this function before threads
+ * come along MUST happen before base_inited is set to 1, or we will
+ * see race conditions.
+ */
base_inited = 1;
-#ifndef OPENSSL_USE_NODELETE
+#if !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE)
+# ifdef DSO_WIN32
+ {
+ HMODULE handle = NULL;
+ BOOL ret;
+
+ /* We don't use the DSO route for WIN32 because there is a better way */
+ ret = GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
+ | GET_MODULE_HANDLE_EX_FLAG_PIN,
+ (void *)&base_inited, &handle);
+
+ return (ret == TRUE) ? 1 : 0;
+ }
+# else
/*
* Deliberately leak a reference to ourselves. This will force the library
- * to remain loaded until the atexit() handler is run a process exit.
+ * to remain loaded until the atexit() handler is run at process exit.
*/
{
DSO *dso = NULL;
+ ERR_set_mark();
dso = DSO_dsobyaddr(&base_inited, DSO_FLAG_NO_UNLOAD_ON_FREE);
DSO_free(dso);
+ ERR_pop_to_mark();
}
+# endif
#endif
return 1;
# endif
ret = err_load_crypto_strings_int();
load_crypto_strings_inited = 1;
-#endif
+#endif
return ret;
}
int ossl_init_thread_start(uint64_t opts)
{
- struct thread_local_inits_st *locals = ossl_init_get_thread_local(1);
+ struct thread_local_inits_st *locals;
+
+ if (!OPENSSL_init_crypto(0, NULL))
+ return 0;
+
+ locals = ossl_init_get_thread_local(1);
if (locals == NULL)
return 0;
return 0;
}
- if (!RUN_ONCE(&base, ossl_init_base))
+ if (!base_inited && !RUN_ONCE(&base, ossl_init_base))
return 0;
if ((opts & OPENSSL_INIT_NO_LOAD_CRYPTO_STRINGS)
{
OPENSSL_INIT_STOP *newhand;
-#ifndef OPENSSL_USE_NODELETE
- /*
- * Deliberately leak a reference to the handler. This will force the
- * library/code containing the handler to remain loaded until we run the
- * atexit handler. If -znodelete has been used then this is unneccessary.
- */
+#if !defined(OPENSSL_NO_DSO) && !defined(OPENSSL_USE_NODELETE)
{
- DSO *dso = NULL;
union {
void *sym;
void (*func)(void);
} handlersym;
handlersym.func = handler;
+# ifdef DSO_WIN32
+ {
+ HMODULE handle = NULL;
+ BOOL ret;
- dso = DSO_dsobyaddr(handlersym.sym, DSO_FLAG_NO_UNLOAD_ON_FREE);
- DSO_free(dso);
+ /*
+ * We don't use the DSO route for WIN32 because there is a better
+ * way
+ */
+ ret = GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
+ | GET_MODULE_HANDLE_EX_FLAG_PIN,
+ handlersym.sym, &handle);
+
+ if (!ret)
+ return 0;
+ }
+# else
+ /*
+ * Deliberately leak a reference to the handler. This will force the
+ * library/code containing the handler to remain loaded until we run the
+ * atexit handler. If -znodelete has been used then this is
+ * unneccessary.
+ */
+ {
+ DSO *dso = NULL;
+
+ ERR_set_mark();
+ dso = DSO_dsobyaddr(handlersym.sym, DSO_FLAG_NO_UNLOAD_ON_FREE);
+ DSO_free(dso);
+ ERR_pop_to_mark();
+ }
+# endif
}
#endif