From: Ben Avison Date: Tue, 29 Mar 2022 13:33:13 +0000 (+0100) Subject: Remove further uses of __ARMEL__ in AArch64 assembly X-Git-Tag: openssl-3.2.0-alpha1~2802 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2bd5cde57e748d6ff21ed26cb448835f86b86ea1;p=thirdparty%2Fopenssl.git Remove further uses of __ARMEL__ in AArch64 assembly The sweep of the source tree in #17373 missed the BSAES assembly due its PR #14592 having been temporarily backed out at the time. This constitutes a partial fix for #17958 - covers cases except when configured with -DOPENSSL_AES_CONST_TIME. Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/17988) --- diff --git a/crypto/aes/asm/bsaes-armv8.pl b/crypto/aes/asm/bsaes-armv8.pl index 5270ca7c628..8519c4bc964 100644 --- a/crypto/aes/asm/bsaes-armv8.pl +++ b/crypto/aes/asm/bsaes-armv8.pl @@ -951,7 +951,7 @@ _bsaes_encrypt8_alt: // v15 = last round key (converted to native endianness) // other SIMD registers corrupted _bsaes_key_convert: -#ifdef __ARMEL__ +#ifdef __AARCH64EL__ adr x11, .LM0_littleendian #else adr x11, .LM0_bigendian @@ -970,7 +970,7 @@ _bsaes_key_convert: movi v22.16b, #0x40 movi v23.16b, #0x80 -#ifdef __ARMEL__ +#ifdef __AARCH64EL__ rev32 v0.16b, v0.16b #endif sub x10, x10, #1 @@ -996,7 +996,7 @@ _bsaes_key_convert: cbnz x10, .Lkey_loop // don't save last round key -#ifdef __ARMEL__ +#ifdef __AARCH64EL__ rev32 v15.16b, v15.16b adr x11, .LM0_bigendian #endif @@ -1429,7 +1429,7 @@ ossl_bsaes_ctr32_encrypt_blocks: mov x22, x3 ldr w23, [x4, #12] // load counter .LSW ldr q1, [x4] // load whole counter value -#ifdef __ARMEL__ +#ifdef __AARCH64EL__ rev w23, w23 #endif str q1, [sp, #80] // copy counter value @@ -1444,7 +1444,7 @@ ossl_bsaes_ctr32_encrypt_blocks: ldr q0, [x19], #16 // load input ldr q1, [sp, #64] // load encrypted counter add x23, x23, #1 -#ifdef __ARMEL__ +#ifdef __AARCH64EL__ rev w0, w23 str w0, [sp, #80+12] // next counter value #else