The branch OpenSSL_1_0_2-stable has been updated via 0ab24083a16c8a4dd35833031bbeaeb0437a7219 (commit) from f36fedcc764bdcadef30fe214f51b18a17f3f08c (commit)
- Log ----------------------------------------------------------------- commit 0ab24083a16c8a4dd35833031bbeaeb0437a7219 Author: Dr. Stephen Henson <st...@openssl.org> Date: Fri Aug 18 17:58:05 2017 +0100 Set FIPS thread id callback. Fixes #4180 Reviewed-by: Rich Salz <rs...@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4192) ----------------------------------------------------------------------- Summary of changes: crypto/cryptlib.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 1925428..5fab45b 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; } _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits