From: Liu-ErMeng Date: Thu, 25 Dec 2025 12:22:19 +0000 (-0800) Subject: fix vpsm4_ex bug in AARCH64 big-endian platform X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8f8e64a560ddf72dd2694ce32eb63a1e8916b00;p=thirdparty%2Fopenssl.git fix vpsm4_ex bug in AARCH64 big-endian platform Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz MergeDate: Mon Jan 12 18:46:42 2026 (Merged from https://github.com/openssl/openssl/pull/29504) --- diff --git a/crypto/sm4/asm/vpsm4_ex-armv8.pl b/crypto/sm4/asm/vpsm4_ex-armv8.pl index 2a1916268d1..57a0476748e 100644 --- a/crypto/sm4/asm/vpsm4_ex-armv8.pl +++ b/crypto/sm4/asm/vpsm4_ex-armv8.pl @@ -559,13 +559,25 @@ _${prefix}_consts: .Lshuffles: .quad 0x0B0A090807060504,0x030201000F0E0D0C .Lxts_magic: +#ifndef __AARCH64EB__ .quad 0x0101010101010187,0x0101010101010101 +#else + .quad 0x0101010101010101,0x0101010101010187 +#endif .Lsbox_magic: +#ifndef __AARCH64EB__ .quad 0x0b0e0104070a0d00,0x0306090c0f020508 .quad 0x62185a2042387a00,0x22581a6002783a40 .quad 0x15df62a89e54e923,0xc10bb67c4a803df7 .quad 0xb9aa6b78c1d21300,0x1407c6d56c7fbead .quad 0x6404462679195b3b,0xe383c1a1fe9edcbc +#else + .quad 0x0306090c0f020508,0x0b0e0104070a0d00 + .quad 0x22581a6002783a40,0x62185a2042387a00 + .quad 0xc10bb67c4a803df7,0x15df62a89e54e923 + .quad 0x1407c6d56c7fbead,0xb9aa6b78c1d21300 + .quad 0xe383c1a1fe9edcbc,0x6404462679195b3b +#endif .quad 0x0f0f0f0f0f0f0f0f,0x0f0f0f0f0f0f0f0f .size _${prefix}_consts,.-_${prefix}_consts