Page MenuHomeFreeBSD
Files F140101987

D41539.id126341.diff
No OneTemporary
Actions

D41539.id126341.diff
View Options

diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -41,25 +41,25 @@
.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
@@ -488,7 +488,8 @@
.if defined(ASM_aarch64)
SRCS+= keccak1600-armv8.S sha1-armv8.S sha256-armv8.S sha512-armv8.S
.elif defined(ASM_amd64)
-SRCS+= keccak1600-x86_64.S sha1-mb-x86_64.S sha1-x86_64.S
+SRCS+= keccak1600-x86_64.S keccak1600-avx2.S keccak1600-avx512.S
+SRCS+= keccak1600-avx512vl.S sha1-mb-x86_64.S sha1-x86_64.S
SRCS+= sha256-mb-x86_64.S sha256-x86_64.S sha512-x86_64.S
.elif defined(ASM_arm)
SRCS+= keccak1600-armv4.S sha1-armv4-large.S sha256-armv4.S sha512-armv4.S
diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Makefile.common
--- a/secure/lib/libcrypto/Makefile.common
+++ b/secure/lib/libcrypto/Makefile.common
@@ -32,8 +32,12 @@
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+= -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

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 21, 6:18 AM (9 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27108614
Default Alt Text
D41539.id126341.diff (2 KB)

Event Timeline