[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  c96670e59a702de71d572958ff60fda5f78637c2 (commit)
      from  b4f1b7b65871de8f44228e77fc9ab2ac8b6d7918 (commit)


- Log -----------------------------------------------------------------
commit c96670e59a702de71d572958ff60fda5f78637c2
Author: Tomas Mraz <tomas at openssl.org>
Date:   Tue Aug 10 09:00:22 2021 +0200

    aes_v8_xts_encrypt is present only on 64bit arm builds
    
    Fixes #16273
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16275)

-----------------------------------------------------------------------

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 f1b1d62549..015c3bd4ab 100644
--- a/include/crypto/aes_platform.h
+++ b/include/crypto/aes_platform.h
@@ -92,7 +92,7 @@ void AES_xts_decrypt(const unsigned char *inp, unsigned char *out, size_t len,
 #    define HWAES_decrypt aes_v8_decrypt
 #    define HWAES_cbc_encrypt aes_v8_cbc_encrypt
 #    define HWAES_ecb_encrypt aes_v8_ecb_encrypt
-#    if __ARM_MAX_ARCH__>=8
+#    if __ARM_MAX_ARCH__>=8 && defined(__aarch64__)
 #     define HWAES_xts_encrypt aes_v8_xts_encrypt
 #     define HWAES_xts_decrypt aes_v8_xts_decrypt
 #    endif