Module Name: src
Committed By: christos
Date: Sun May 14 17:50:29 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ec.inc
Log Message:
make arm build
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r0 -r1.1 \
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.5 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.5 Wed Mar 7 15:38:39 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc Sun May 14 13:50:29 2023
@@ -1,13 +1,15 @@
.include "arm.inc"
.PATH.S: ${.PARSEDIR}
-AES_SRCS += aes-armv4.S aes_cbc.c
+AES_SRCS += aes-armv4.S aes_cbc.c aesv8-armx.S
-.if ${ARM_MAX_ARCH} >= 7
+.if ${ARM_MAX_ARCH} >= 8
+AES_SRCS+=vpaes-armv8.S
+AESCPPFLAGS += -DVPAES_ASM
+.elif ${ARM_MAX_ARCH} >= 7
AES_SRCS+=bsaes-armv7.S
-.elif ${ARM_MAX_ARCH} >= 8
-AES_SRCS+=aesv8-armx.S
+AESCPPFLAGS += -DBSAES_ASM
.endif
-AESCPPFLAGS = -DAES_ASM -DBSAES_ASM
+AESCPPFLAGS += -DAES_ASM
.include "../../aes.inc"
Added files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.1
--- /dev/null Sun May 14 13:50:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc Sun May 14 13:50:29 2023
@@ -0,0 +1,12 @@
+.PATH.S: ${.PARSEDIR}
+
+.if ${ARM_MAX_ARCH} >= 8
+EC_SRCS += ecp_nistz256-armv8.S
+ECNI = yes
+.elif ${ARM_MAX_ARCH} >= 4
+EC_SRCS += ecp_nistz256-armv4.S
+ECNI = yes
+.endif
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"
