diff options
author | Matt Caswell <matt@openssl.org> | 2016-05-19 20:11:09 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2016-05-20 23:08:18 +0100 |
commit | fcb318c64b8c3ff24ec36f99797880386bed5867 (patch) | |
tree | bcf69b03f51b62f326be4bd316dba29195f41ac7 /crypto/threads_win.c | |
parent | 739a1eb1961cdc3b1597a040766f3cb359d095f6 (diff) | |
download | openssl-fcb318c64b8c3ff24ec36f99797880386bed5867.tar.gz |
Fix Windows 64 bit crashes
The function InitOnceExceuteOnce is the best way to support the
implementation of CRYPTO_THREAD_run_once() on Windows. Unfortunately
WinXP doesn't have it. To get around that we had two different
implementations: one for WinXP and one for later versions. Which one was
used was based on the value of _WIN32_WINNT.
This approach was starting to cause problems though because other parts of
OpenSSL assume _WIN32_WINNT is going to be 0x0501 and crashes were
occurring dependant on include file ordering. In addition a conditional
based on _WIN32_WINNT had made its way into a public header file through
commit 5c4328f. This is problematic because the value of this macro can
vary between OpenSSL build time and application build time.
The simplest solution to this mess is just to always use the WinXP version
of CRYPTO_THREAD_run_once(). Its perhaps slightly sub-optimal but probably
not noticably.
GitHub Issue #1086
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'crypto/threads_win.c')
-rw-r--r-- | crypto/threads_win.c | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/crypto/threads_win.c b/crypto/threads_win.c index ff4aae4f32..545b9beb87 100644 --- a/crypto/threads_win.c +++ b/crypto/threads_win.c @@ -55,12 +55,14 @@ void CRYPTO_THREAD_lock_free(CRYPTO_RWLOCK *lock) return; } -# if _WIN32_WINNT < 0x0600 - # define ONCE_UNINITED 0 # define ONCE_ININIT 1 # define ONCE_DONE 2 +/* + * We don't use InitOnceExecuteOnce because that isn't available in WinXP which + * we still have to support. + */ int CRYPTO_THREAD_run_once(CRYPTO_ONCE *once, void (*init)(void)) { LONG volatile *lock = (LONG *)once; @@ -81,27 +83,6 @@ int CRYPTO_THREAD_run_once(CRYPTO_ONCE *once, void (*init)(void)) return (*lock == ONCE_DONE); } -# else - -BOOL CALLBACK once_cb(PINIT_ONCE once, PVOID p, PVOID *pp) -{ - void (*init)(void) = p; - - init(); - - return TRUE; -} - -int CRYPTO_THREAD_run_once(CRYPTO_ONCE *once, void (*init)(void)) -{ - if (InitOnceExecuteOnce(once, once_cb, init, NULL)) - return 1; - - return 0; -} - -# endif - int CRYPTO_THREAD_init_local(CRYPTO_THREAD_LOCAL *key, void (*cleanup)(void *)) { *key = TlsAlloc(); |