diff options
| author | Tom Cosgrove <tom.cosgrove@arm.com> | 2021-11-02 15:26:21 +0000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-11-04 15:51:08 +0100 |
| commit | 42dd2d1b719cad4359157f244270386ada781420 (patch) | |
| tree | f612d763ac1f79dc9e4c828ba6de6a036c6d7801 /include | |
| parent | 3f671950747ed2a6655e9a0dbc08fcd9a8285091 (diff) | |
Fix builds on Armv8 systems without AArch64
This fixes "undefined reference to `aes_gcm_dec_128_kernel' in function
`armv8_aes_gcm_decrypt'" and similar
Fixes #16949
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16951)
(cherry picked from commit 3841d0f6f02e1ad3a54beabf1d5395bd1c383254)
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypto/aes_platform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h index 015c3bd4ab..e95ad5aa5d 100644 --- a/include/crypto/aes_platform.h +++ b/include/crypto/aes_platform.h @@ -100,7 +100,7 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len, # define AES_PMULL_CAPABLE ((OPENSSL_armcap_P & ARMV8_PMULL) && (OPENSSL_armcap_P & ARMV8_AES)) # define AES_GCM_ENC_BYTES 512 # define AES_GCM_DEC_BYTES 512 -# if __ARM_MAX_ARCH__>=8 +# if __ARM_MAX_ARCH__>=8 && defined(__aarch64__) # define AES_gcm_encrypt armv8_aes_gcm_encrypt # define AES_gcm_decrypt armv8_aes_gcm_decrypt # define AES_GCM_ASM(gctx) ((gctx)->ctr==aes_v8_ctr32_encrypt_blocks && \ |