From: Matt Caswell Date: Thu, 4 Feb 2016 15:24:06 +0000 (+0000) Subject: Don't use RDRAND if told not to X-Git-Tag: OpenSSL_1_1_0-pre3~267 X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=d698550fb41c3fd1e5c4c8fc6bed37cd8931467d Don't use RDRAND if told not to Ensure we respect OPENSSL_NO_RDRAND Reviewed-by: Rich Salz --- diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c index 2b8abce370..9b6b0b56f9 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