Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/16951] Signed-off-by: Ross Burton From 5118e96a3dbedde2523e7726fa34af30923a9add Mon Sep 17 00:00:00 2001 From: Tom Cosgrove Date: Tue, 2 Nov 2021 15:26:21 +0000 Subject: [PATCH] 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 --- include/crypto/aes_platform.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/crypto/aes_platform.h b/include/crypto/aes_platform.h index 015c3bd4ab91..e95ad5aa5de6 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 && \