[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  03cdfe1efaf2a3b5192b8cb3ef331939af7bfeb8 (commit)
      from  ef45aa14c5af024fcb8bef1c9007f3d1c115bd85 (commit)


- Log -----------------------------------------------------------------
commit 03cdfe1efaf2a3b5192b8cb3ef331939af7bfeb8
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 6 20:51:47 2019 +0100

    test/drbgtest.c: call OPENSSL_thread_stop() explicitly
    
    The manual says this in its notes:
    
        ... and therefore applications using static linking should also call
        OPENSSL_thread_stop() on each thread. ...
    
    Fixes #8171
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/8173)

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

Summary of changes:
 test/drbgtest.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/drbgtest.c b/test/drbgtest.c
index 4546f63..c788f19 100644
--- a/test/drbgtest.c
+++ b/test/drbgtest.c
@@ -839,6 +839,11 @@ typedef HANDLE thread_t;
 static DWORD WINAPI thread_run(LPVOID arg)
 {
     run_multi_thread_test();
+    /*
+     * Because we're linking with a static library, we must stop each
+     * thread explicitly, or so says OPENSSL_thread_stop(3)
+     */
+    OPENSSL_thread_stop();
     return 0;
 }
 
@@ -860,6 +865,11 @@ typedef pthread_t thread_t;
 static void *thread_run(void *arg)
 {
     run_multi_thread_test();
+    /*
+     * Because we're linking with a static library, we must stop each
+     * thread explicitly, or so says OPENSSL_thread_stop(3)
+     */
+    OPENSSL_thread_stop();
     return NULL;
 }