aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Foley <foleyj@cisco.com>2016-06-20 12:11:35 -0400
committerRich Salz <rsalz@openssl.org>2016-06-21 16:49:26 -0400
commita43cfd7bb1fc681d563e5efa75cc926d7e8e5c36 (patch)
tree24d8352abaab57c4000a6037d29db03b2113dc8d
parent482449624c6ca12d24f29eca0448eb589c50b0ec (diff)
downloadopenssl-a43cfd7bb1fc681d563e5efa75cc926d7e8e5c36.tar.gz
RT3752: Add FIPS callback for thread id
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
-rw-r--r--crypto/o_init.c3
1 files changed, 3 insertions, 0 deletions
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();