The branch master has been updated
via 3841d0f6f02e1ad3a54beabf1d5395bd1c383254 (commit)
from d99004fe5de934120765d342586f08d22131b8ed (commit)
- Log -----------------------------------------------------------------
commit 3841d0f6f02e1ad3a54beabf1d5395bd1c383254
Author: Tom Cosgrove <[email protected]>
Date: Tue Nov 2 15:26:21 2021 +0000
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 <[email protected]>
Reviewed-by: Tomas Mraz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/16951)
-----------------------------------------------------------------------
Summary of changes:
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 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 && \
