[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6bc7bad011d98e38039105dc2624426917c0e587 (commit)
      from  4015adf0a3d352cc4013c722f1b2d5374989ac4c (commit)


- Log -----------------------------------------------------------------
commit 6bc7bad011d98e38039105dc2624426917c0e587
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Feb 18 12:24:09 2016 +0000

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/init.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 @@ static void ossl_init_thread_stop(struct thread_local_inits_st *locals)
     }
 
     OPENSSL_free(locals);
-    ossl_init_thread_stop_cleanup();
 }
 
 void OPENSSL_thread_stop(void)
@@ -599,6 +598,8 @@ void OPENSSL_cleanup(void)
         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");