aboutsummaryrefslogtreecommitdiff
path: root/secure
diff options
context:
space:
mode:
authorJohn Baldwin <jhb@FreeBSD.org>2023-08-22 04:02:42 +0000
committerJohn Baldwin <jhb@FreeBSD.org>2023-08-22 04:02:42 +0000
commit3250c9d5272821e5b796144c63b1de982cd4e43b (patch)
tree168d6e844269cb86928001125889968af206be33 /secure
parent74d73bb743c759e6d4d67435d383d501585c4680 (diff)
Diffstat (limited to 'secure')
-rw-r--r--secure/lib/libcrypto/Makefile20
-rw-r--r--secure/lib/libcrypto/Makefile.common6
2 files changed, 16 insertions, 10 deletions
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
index d4102c6cd0cf..f4bd4a3247f3 100644
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -41,25 +41,25 @@ SRCS+= mem_clr.c
.endif
# aes
-SRCS+= aes_cbc.c aes_cfb.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c
+SRCS+= aes_cfb.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c
.if defined(ASM_aarch64)
-SRCS+= aes_core.c aesv8-armx.S vpaes-armv8.S
+SRCS+= aes_cbc.c aes_core.c aesv8-armx.S vpaes-armv8.S
ACFLAGS.aesv8-armx.S= -march=armv8-a+crypto
.elif defined(ASM_amd64)
-SRCS+= aes_core.c aesni-mb-x86_64.S aesni-sha1-x86_64.S aesni-sha256-x86_64.S
-SRCS+= aesni-x86_64.S vpaes-x86_64.S
+SRCS+= aes-x86_64.S aesni-mb-x86_64.S aesni-sha1-x86_64.S
+SRCS+= aesni-sha256-x86_64.S aesni-x86_64.S bsaes-x86_64.S vpaes-x86_64.S
.elif defined(ASM_arm)
-SRCS+= aes-armv4.S aesv8-armx.S bsaes-armv7.S
+SRCS+= aes_cbc.c aes-armv4.S aesv8-armx.S bsaes-armv7.S
.elif defined(ASM_i386)
-SRCS+= aes_core.c aesni-x86.S vpaes-x86.S
+SRCS+= aes-586.S aesni-x86.S vpaes-x86.S
.elif defined(ASM_powerpc)
-SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S
+SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S
.elif defined(ASM_powerpc64)
-SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S
+SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S
.elif defined(ASM_powerpc64le)
-SRCS+= aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S
+SRCS+= aes_cbc.c aes_core.c aes-ppc.S vpaes-ppc.S aesp8-ppc.S
.else
-SRCS+= aes_core.c
+SRCS+= aes_cbc.c aes_core.c
.endif
# asn1
diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Makefile.common
index 620bc9178f38..a52e2979060a 100644
--- a/secure/lib/libcrypto/Makefile.common
+++ b/secure/lib/libcrypto/Makefile.common
@@ -32,8 +32,12 @@ CFLAGS+= -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
CFLAGS+= -DKECCAK1600_ASM
CFLAGS+= -DRC4_ASM
CFLAGS+= -DMD5_ASM
+CFLAGS+= -DAES_ASM
+CFLAGS+= -DBSAES_ASM
CFLAGS+= -DVPAES_ASM
+CFLAGS+= -DWHIRLPOOL_ASM
CFLAGS+= -DGHASH_ASM
+CFLAGS+= -DCMLL_ASM
CFLAGS+= -DECP_NISTZ256_ASM -DX25519_ASM
CFLAGS+= -DPADLOCK_ASM
CFLAGS+= -DPOLY1305_ASM
@@ -53,9 +57,11 @@ CFLAGS+= -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
CFLAGS+= -DRC4_ASM
CFLAGS+= -DMD5_ASM
CFLAGS+= -DRMD160_ASM
+CFLAGS+= -DAES_ASM
CFLAGS+= -DVPAES_ASM
CFLAGS+= -DWHIRLPOOL_ASM
CFLAGS+= -DGHASH_ASM
+CFLAGS+= -DCMLL_ASM
CFLAGS+= -DECP_NISTZ256_ASM
CFLAGS+= -DPADLOCK_ASM
CFLAGS+= -DPOLY1305_ASM