summaryrefslogtreecommitdiffstats
path: root/crypto/cryptlib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2017-08-18 17:58:05 +0100
committerDr. Stephen Henson <steve@openssl.org>2017-08-18 18:34:34 +0100
commit0ab24083a16c8a4dd35833031bbeaeb0437a7219 (patch)
tree6518d30e93d1ee5c0d27be92ea35ad472b6b151b /crypto/cryptlib.c
parentf36fedcc764bdcadef30fe214f51b18a17f3f08c (diff)
Set FIPS thread id callback.
Fixes #4180 Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4192)
Diffstat (limited to 'crypto/cryptlib.c')
-rw-r--r--crypto/cryptlib.c7
1 files changed, 7 insertions, 0 deletions
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;
}