The branch master has been updated
via d698550fb41c3fd1e5c4c8fc6bed37cd8931467d (commit)
from c4cbf9b3440adcd3fd2454dccb163552ed7db73a (commit)
- Log -----------------------------------------------------------------
commit d698550fb41c3fd1e5c4c8fc6bed37cd8931467d
Author: Matt Caswell <[email protected]>
Date: Thu Feb 4 15:24:06 2016 +0000
Don't use RDRAND if told not to
Ensure we respect OPENSSL_NO_RDRAND
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
crypto/rand/md_rand.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c
index 2b8abce..9b6b0b5 100644
--- a/crypto/rand/md_rand.c
+++ b/crypto/rand/md_rand.c
@@ -686,7 +686,8 @@ static int rand_status(void)
#if (defined(__i386) || defined(__i386__) || defined(_M_IX86) || \
defined(__x86_64) || defined(__x86_64__) || \
- defined(_M_AMD64) || defined (_M_X64)) && defined(OPENSSL_CPUID_OBJ)
+ defined(_M_AMD64) || defined (_M_X64)) && defined(OPENSSL_CPUID_OBJ) \
+ && !defined(OPENSSL_NO_RDRAND)
# define RDRAND_CALLS 4
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
