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/evp/e_aes_cbc_hmac_sha1.c | |
| parent | 2f9789f7e7e8f17da32e1cadbbc3c398f99f2d23 (diff) | |
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/evp/e_aes_cbc_hmac_sha1.c')
| -rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index 8d557e512e..9e393f0b88 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -15,6 +15,7 @@ #include <openssl/aes.h> #include <openssl/sha.h> #include <openssl/rand.h> +#include "internal/cryptlib.h" #include "internal/modes_int.h" #include "internal/evp_int.h" #include "internal/constant_time_locl.h" @@ -35,7 +36,6 @@ typedef struct { defined(__x86_64) || defined(__x86_64__) || \ defined(_M_AMD64) || defined(_M_X64) ) -extern unsigned int OPENSSL_ia32cap_P[]; # define AESNI_CAPABLE (1<<(57-32)) int aesni_set_encrypt_key(const unsigned char *userKey, int bits, |