diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-10-03 08:28:31 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-10-03 15:07:26 +0200 |
| commit | 61cc715240d2d3f9511ca88043a3e9797c11482f (patch) | |
| tree | e365f980583bf720cd5fcc167dd7d3ed3f2cd603 /crypto/evp | |
| parent | 1a9a56865cb66d9fca067ba00d0e030f4b6974aa (diff) | |
Define AESNI_ASM if AESNI assembler is included, and use it
Because we have cases where basic assembler support isn't present, but
AESNI asssembler support is, we need a separate macro that indicates
that, and use it.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/10080)
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha1.c | 2 | ||||
| -rw-r--r-- | crypto/evp/e_aes_cbc_hmac_sha256.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/evp/e_aes_cbc_hmac_sha1.c b/crypto/evp/e_aes_cbc_hmac_sha1.c index c9f5969162..27c36b46e7 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha1.c +++ b/crypto/evp/e_aes_cbc_hmac_sha1.c @@ -33,7 +33,7 @@ typedef struct { #define NO_PAYLOAD_LENGTH ((size_t)-1) -#if defined(AES_ASM) && ( \ +#if defined(AESNI_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ defined(_M_AMD64) || defined(_M_X64) ) diff --git a/crypto/evp/e_aes_cbc_hmac_sha256.c b/crypto/evp/e_aes_cbc_hmac_sha256.c index d5178313ae..cc622b6faa 100644 --- a/crypto/evp/e_aes_cbc_hmac_sha256.c +++ b/crypto/evp/e_aes_cbc_hmac_sha256.c @@ -34,7 +34,7 @@ typedef struct { # define NO_PAYLOAD_LENGTH ((size_t)-1) -#if defined(AES_ASM) && ( \ +#if defined(AESNI_ASM) && ( \ defined(__x86_64) || defined(__x86_64__) || \ defined(_M_AMD64) || defined(_M_X64) ) @@ -947,4 +947,4 @@ const EVP_CIPHER *EVP_aes_256_cbc_hmac_sha256(void) { return NULL; } -#endif +#endif /* AESNI_ASM */ |