summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2023-05-14 17:50:29 +0000
committerchristos <christos@NetBSD.org>2023-05-14 17:50:29 +0000
commit7dc87b12cdcf7de5c6eefaceeac69e508c7fe430 (patch)
treecb2f3a92ca2220b27055cc27ae29dd1fbd48ce88 /crypto
parentc90849018ca016ad2bb36ba4867c6c095cdd4527 (diff)
make arm build
Diffstat (limited to 'crypto')
-rw-r--r--crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc12
-rw-r--r--crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc12
2 files changed, 19 insertions, 5 deletions
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
index 4dbf1e5295d..b7f2c072b1f 100644
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
@@ -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"
diff --git a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
new file mode 100644
index 00000000000..79eb19104d4
--- /dev/null
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
@@ -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"