From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 18 Aug 2017 16:58:05 +0000 (+0100)
Subject: Set FIPS thread id callback.
X-Git-Tag: OpenSSL_1_0_2m~36
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0ab24083a16c8a4dd35833031bbeaeb0437a7219;p=oweals%2Fopenssl.git

Set FIPS thread id callback.

Fixes #4180

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4192)
---

diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c
index 1925428f5e..5fab45b2ec 100644
--- a/crypto/cryptlib.c
+++ b/crypto/cryptlib.c
@@ -469,11 +469,18 @@ void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr)
     }
 }
 
+#ifdef OPENSSL_FIPS
+extern int FIPS_crypto_threadid_set_callback(void (*func) (CRYPTO_THREADID *));
+#endif
+
 int CRYPTO_THREADID_set_callback(void (*func) (CRYPTO_THREADID *))
 {
     if (threadid_callback)
         return 0;
     threadid_callback = func;
+#ifdef OPENSSL_FIPS
+    FIPS_crypto_threadid_set_callback(func);
+#endif
     return 1;
 }