Module Name: src
Committed By: riastradh
Date: Tue May 16 18:25:54 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc ec.inc
Log Message:
openssl: Limit armv8 stuff to aarch64.
Strictly speaking there is armv8 aarch32, e.g. AES instructions are
exposed to 32-bit mode, but OpenSSL's `*_armv8.S' files are staunchly
aarch64 and don't work when built for aarch64 32-bit compat libraries
(which could take advantage of armv8 instructions, but only if the
code is actually aarch32, which it isn't).
The armv8 stuff is still included in aarch64 /usr/lib/libcrypto, just
not in the 32-bit compat libraries.
With any luck, this will fix the aarch64 clang build (again).
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.6 Sun May 14 17:50:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc Tue May 16 18:25:54 2023
@@ -3,10 +3,7 @@
.PATH.S: ${.PARSEDIR}
AES_SRCS += aes-armv4.S aes_cbc.c aesv8-armx.S
-.if ${ARM_MAX_ARCH} >= 8
-AES_SRCS+=vpaes-armv8.S
-AESCPPFLAGS += -DVPAES_ASM
-.elif ${ARM_MAX_ARCH} >= 7
+.if ${ARM_MAX_ARCH} >= 7
AES_SRCS+=bsaes-armv7.S
AESCPPFLAGS += -DBSAES_ASM
.endif
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.1 Sun May 14 17:50:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc Tue May 16 18:25:54 2023
@@ -1,9 +1,6 @@
.PATH.S: ${.PARSEDIR}
-.if ${ARM_MAX_ARCH} >= 8
-EC_SRCS += ecp_nistz256-armv8.S
-ECNI = yes
-.elif ${ARM_MAX_ARCH} >= 4
+.if ${ARM_MAX_ARCH} >= 4
EC_SRCS += ecp_nistz256-armv4.S
ECNI = yes
.endif
