diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2019-08-24 11:28:19 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2019-09-01 15:41:58 +0200 |
| commit | 24fd8541d47a46052b975db98b465faa7e4d898c (patch) | |
| tree | fbe9188d876ba1ad776b57ee6c66197166299dfb /crypto/engine | |
| parent | 2f9789f7e7e8f17da32e1cadbbc3c398f99f2d23 (diff) | |
| download | openssl-new-24fd8541d47a46052b975db98b465faa7e4d898c.tar.gz | |
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 <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/9688)
Diffstat (limited to 'crypto/engine')
| -rw-r--r-- | crypto/engine/eng_rdrand.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 <stdio.h> #include <string.h> #include "internal/engine.h" +#include "internal/cryptlib.h" #include <openssl/rand.h> #include <openssl/err.h> #include <openssl/crypto.h> @@ -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) |