mirror of
https://github.com/openssl/openssl.git
synced 2024-12-21 06:09:35 +08:00
24d16d3a19
Currently, rcu has a global bit of data, the CRYPTO_THREAD_LOCAL object to store per thread data. This works in some cases, but fails in FIPS, becuase it contains its own copy of the global key. So 1) Make the rcu_thr_key a per-context variable, and force ossl_rcu_lock_new to be context aware 2) Store a pointer to the context in the lock object 3) Use the context to get the global thread key on read/write lock 4) Use ossl_thread_start_init to properly register a cleanup on thread exit 5) Fix up missed calls to OSSL_thread_stop() in our tests Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/24162)
84 lines
1.5 KiB
C
84 lines
1.5 KiB
C
/*
|
|
* Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the Apache License 2.0 (the "License"). You may not use
|
|
* this file except in compliance with the License. You can obtain a copy
|
|
* in the file LICENSE in the source distribution or at
|
|
* https://www.openssl.org/source/license.html
|
|
*/
|
|
|
|
#if defined(_WIN32)
|
|
# include <windows.h>
|
|
#endif
|
|
|
|
#include <string.h>
|
|
#include "testutil.h"
|
|
|
|
#if !defined(OPENSSL_THREADS) || defined(CRYPTO_TDEBUG)
|
|
|
|
typedef unsigned int thread_t;
|
|
|
|
static int run_thread(thread_t *t, void (*f)(void))
|
|
{
|
|
f();
|
|
return 1;
|
|
}
|
|
|
|
static int wait_for_thread(thread_t thread)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
#elif defined(OPENSSL_SYS_WINDOWS)
|
|
|
|
typedef HANDLE thread_t;
|
|
|
|
static DWORD WINAPI thread_run(LPVOID arg)
|
|
{
|
|
void (*f)(void);
|
|
|
|
*(void **) (&f) = arg;
|
|
|
|
f();
|
|
return 0;
|
|
}
|
|
|
|
static int run_thread(thread_t *t, void (*f)(void))
|
|
{
|
|
*t = CreateThread(NULL, 0, thread_run, *(void **) &f, 0, NULL);
|
|
return *t != NULL;
|
|
}
|
|
|
|
static int wait_for_thread(thread_t thread)
|
|
{
|
|
return WaitForSingleObject(thread, INFINITE) == 0;
|
|
}
|
|
|
|
#else
|
|
|
|
typedef pthread_t thread_t;
|
|
|
|
static void *thread_run(void *arg)
|
|
{
|
|
void (*f)(void);
|
|
|
|
*(void **) (&f) = arg;
|
|
|
|
f();
|
|
OPENSSL_thread_stop();
|
|
return NULL;
|
|
}
|
|
|
|
static int run_thread(thread_t *t, void (*f)(void))
|
|
{
|
|
return pthread_create(t, NULL, thread_run, *(void **) &f) == 0;
|
|
}
|
|
|
|
static int wait_for_thread(thread_t thread)
|
|
{
|
|
return pthread_join(thread, NULL) == 0;
|
|
}
|
|
|
|
#endif
|
|
|