[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Rich Salz]

The branch OpenSSL_1_0_2-stable has been updated
       via  a43cfd7bb1fc681d563e5efa75cc926d7e8e5c36 (commit)
      from  482449624c6ca12d24f29eca0448eb589c50b0ec (commit)


- Log -----------------------------------------------------------------
commit a43cfd7bb1fc681d563e5efa75cc926d7e8e5c36
Author: John Foley <foleyj at cisco.com>
Date:   Mon Jun 20 12:11:35 2016 -0400

    RT3752: Add FIPS callback for thread id
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/o_init.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/crypto/o_init.c b/crypto/o_init.c
index 2088388..185841e 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();