projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4824496
)
RT3752: Add FIPS callback for thread id
author
John Foley
<foleyj@cisco.com>
Mon, 20 Jun 2016 16:11:35 +0000
(12:11 -0400)
committer
Rich Salz
<rsalz@openssl.org>
Tue, 21 Jun 2016 20:49:26 +0000
(16:49 -0400)
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
crypto/o_init.c
patch
|
blob
|
history
diff --git
a/crypto/o_init.c
b/crypto/o_init.c
index 2088388128e60f76c4c7b5b762bc4e24d56b68a4..185841ea048c5993e251ae23514c736dab0d76a6 100644
(file)
--- 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();