[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

Andy Polyakov appro at openssl.org
Mon Apr 10 10:10:07 UTC 2017


The branch OpenSSL_1_1_0-stable has been updated
       via  6d1ab3f5c87e44f9092f3eafe88dc5014e1af2f1 (commit)
      from  c74be80027e30201e176f3fa7ace64e5e8ad4691 (commit)


- Log -----------------------------------------------------------------
commit 6d1ab3f5c87e44f9092f3eafe88dc5014e1af2f1
Author: Andy Polyakov <appro at openssl.org>
Date:   Sat Apr 8 22:29:09 2017 +0200

    rand/rand_lib.c: keep fixing no-engine configuration.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (cherry picked from commit ce57ac431964f7692af674fd124103d6fe07af2e)

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

Summary of changes:
 crypto/rand/rand_lib.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
index c1373e5..62770d4 100644
--- a/crypto/rand/rand_lib.c
+++ b/crypto/rand/rand_lib.c
@@ -118,7 +118,9 @@ void rand_cleanup_int(void)
         meth->cleanup();
     RAND_set_rand_method(NULL);
     CRYPTO_THREAD_lock_free(rand_meth_lock);
+#ifndef OPENSSL_NO_ENGINE
     CRYPTO_THREAD_lock_free(rand_engine_lock);
+#endif
 }
 
 void RAND_seed(const void *buf, int num)


More information about the openssl-commits mailing list