From 24fd8541d47a46052b975db98b465faa7e4d898c Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Sat, 24 Aug 2019 11:28:19 +0200 Subject: Remove extern declarations of OPENSSL_ia32cap_P Use the header file internal/cryptlib.h instead. Remove checks for OPENSSL_NO_ASM and I386_ONLY in cryptlib.c, to match the checks in other places where OPENSSL_ia32cap_P is used and assumed to be initialized. Reviewed-by: Kurt Roeckx (Merged from https://github.com/openssl/openssl/pull/9688) --- crypto/engine/eng_rdrand.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'crypto/engine') diff --git a/crypto/engine/eng_rdrand.c b/crypto/engine/eng_rdrand.c index 2fcc0edff2..7dd3b9fdf6 100644 --- a/crypto/engine/eng_rdrand.c +++ b/crypto/engine/eng_rdrand.c @@ -12,6 +12,7 @@ #include #include #include "internal/engine.h" +#include "internal/cryptlib.h" #include #include #include @@ -79,8 +80,6 @@ static ENGINE *ENGINE_rdrand(void) void engine_load_rdrand_int(void) { - extern unsigned int OPENSSL_ia32cap_P[]; - if (OPENSSL_ia32cap_P[1] & (1 << (62 - 32))) { ENGINE *toadd = ENGINE_rdrand(); if (!toadd) -- cgit v1.2.3