commit 6bc7bad011d98e38039105dc2624426917c0e587
author Matt Caswell <matt@openssl.org> Thu Feb 18 12:24:09 2016 +0000
committer Matt Caswell <matt@openssl.org> Thu Feb 18 15:27:16 2016 +0000
tree 00d8beb56bb9d015c87e9722d53210de7f0b754f
parent 4015adf0a3d352cc4013c722f1b2d5374989ac4c

Fix windows thread stop code

The windows thread stop code was erroneously not just deleting the thread
local variable on thread stop, but also deleting the thread local *key*
(thus removing thread local data for *all* threads in one go!).

Reviewed-by: Rich Salz <rsalz@openssl.org>

crypto/init.c

diff --git a/crypto/init.c b/crypto/init.c
index 8775b82..cbe07df 100644
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -506,7 +506,6 @@
     }
 
     OPENSSL_free(locals);
-    ossl_init_thread_stop_cleanup();
 }
 
 void OPENSSL_thread_stop(void)
@@ -599,6 +598,8 @@
         ERR_free_strings();
     }
 
+    ossl_init_thread_stop_cleanup();
+
 #ifdef OPENSSL_INIT_DEBUG
     fprintf(stderr, "OPENSSL_INIT: OPENSSL_INIT_library_stop: "
                     "CRYPTO_cleanup_all_ex_data()\n");