mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 13:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove further uses of __ARMEL__ in AArch64 assembly

Browse Source 
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 <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17988)
This commit is contained in:
Ben Avison 2022-03-29 14:33:13 +01:00 committed by Tomas Mraz
parent db44b55aaa
commit 2bd5cde57e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/aes/asm/bsaes-armv8.pl
View File

@ -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