From: John Foley <foleyj@cisco.com>
Date: Mon, 20 Jun 2016 16:11:35 +0000 (-0400)
Subject: RT3752: Add FIPS callback for thread id
X-Git-Tag: OpenSSL_1_0_2i~132
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a43cfd7bb1fc681d563e5efa75cc926d7e8e5c36;p=oweals%2Fopenssl.git

RT3752: Add FIPS callback for thread id

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
---

diff --git a/crypto/o_init.c b/crypto/o_init.c
index 2088388128..185841ea04 100644
--- a/crypto/o_init.c
+++ b/crypto/o_init.c
@@ -73,6 +73,9 @@ void OPENSSL_init(void)
     done = 1;
 #ifdef OPENSSL_FIPS
     FIPS_set_locking_callbacks(CRYPTO_lock, CRYPTO_add_lock);
+# ifndef OPENSSL_NO_DEPRECATED
+    FIPS_crypto_set_id_callback(CRYPTO_thread_id);
+# endif
     FIPS_set_error_callbacks(ERR_put_error, ERR_add_error_vdata);
     FIPS_set_malloc_callbacks(CRYPTO_malloc, CRYPTO_free);
     RAND_init_fips();