Page MenuHomeFreeBSD
Files F175048511

D60395.diff
No OneTemporary
Actions

D60395.diff
View Options

diff --git a/crypto/openssl/crypto/bio/bio_sock2.c b/crypto/openssl/crypto/bio/bio_sock2.c
--- a/crypto/openssl/crypto/bio/bio_sock2.c
+++ b/crypto/openssl/crypto/bio/bio_sock2.c
@@ -53,17 +53,6 @@
ERR_raise(ERR_LIB_BIO, BIO_R_UNABLE_TO_CREATE_SOCKET);
return INVALID_SOCKET;
}
-# ifndef OPENSSL_NO_KTLS
- {
- /*
- * The new socket is created successfully regardless of ktls_enable.
- * ktls_enable doesn't change any functionality of the socket, except
- * changing the setsockopt to enable the processing of ktls_start.
- * Thus, it is not a problem to call it for non-TLS sockets.
- */
- ktls_enable(sock);
- }
-# endif
return sock;
}
diff --git a/crypto/openssl/patch b/crypto/openssl/patch
deleted file mode 100644
diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile
--- a/secure/lib/libcrypto/Makefile
+++ b/secure/lib/libcrypto/Makefile
@@ -58,7 +58,7 @@
# aes
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_cbc.c aes_core.c aesv8-armx.S vpaes-armv8.S
+SRCS+= aes_cbc.c aes_core.c aesv8-armx.S bsaes-armv8.S vpaes-armv8.S
ACFLAGS.aesv8-armx.S= -march=armv8-a+crypto
.elif defined(ASM_amd64)
SRCS+= aes-x86_64.S aesni-mb-x86_64.S aesni-sha1-x86_64.S aesni-sha256-x86_64.S
@@ -314,7 +314,9 @@
# md5
SRCS+= md5_dgst.c md5_one.c md5_sha1.c
-.if defined(ASM_amd64)
+.if defined(ASM_aarch64)
+SRCS+= md5-aarch64.S
+.elif defined(ASM_amd64)
SRCS+= md5-x86_64.S
.elif defined(ASM_i386)
SRCS+= md5-586.S
@@ -399,13 +401,14 @@
SRCS+= securitycheck_default.c
# providers/common/der
+# der_digests_gen.c, der_dsa_key.c and der_ec_key.c are not listed: nothing in
+# libcrypto references them, and upstream's linker drops them from libcommon.a.
SRCS+= der_rsa_gen.c der_rsa_key.c der_rsa_sig.c
-SRCS+= der_digests_gen.c
SRCS+= der_ml_dsa_gen.c der_ml_dsa_key.c
SRCS+= der_wrap_gen.c
SRCS+= der_slh_dsa_gen.c der_slh_dsa_key.c
-SRCS+= der_dsa_gen.c der_dsa_key.c der_dsa_sig.c
-SRCS+= der_ec_gen.c der_ec_key.c der_ec_sig.c
+SRCS+= der_dsa_gen.c der_dsa_sig.c
+SRCS+= der_ec_gen.c der_ec_sig.c
SRCS+= der_ecx_gen.c der_ecx_key.c
# providers/implementations/asymciphers
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
@@ -22,7 +22,8 @@
CFLAGS+= -DOPENSSL_BN_ASM_MONT
CFLAGS+= -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM
CFLAGS+= -DKECCAK1600_ASM
-CFLAGS+= -DVPAES_ASM
+CFLAGS+= -DMD5_ASM
+CFLAGS+= -DBSAES_ASM -DVPAES_ASM
CFLAGS+= -DECP_NISTZ256_ASM
CFLAGS+= -DPOLY1305_ASM
.elif defined(ASM_amd64)
diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile
--- a/secure/lib/libssl/Makefile
+++ b/secure/lib/libssl/Makefile
@@ -33,6 +33,9 @@
SRCS+= hashfunc.c
SRCS+= siphash.c
+# crypto/thread: libssl has its own copy, as upstream does
+SRCS+= arch.c thread_none.c thread_posix.c thread_win.c
+
# quic
SRCS+= quic_method.c quic_impl.c quic_wire.c quic_ackm.c quic_statm.c
SRCS+= cc_newreno.c quic_demux.c quic_record_rx.c
@@ -67,8 +70,8 @@
# record/methods
SRCS+= tls_common.c ssl3_meth.c tls1_meth.c tls13_meth.c tlsany_meth.c
SRCS+= dtls_meth.c tls_multib.c
-SRSC+= ssl3_cbc.c
-SRSC+= tls_pad.c
+SRCS+= ssl3_cbc.c
+SRCS+= tls_pad.c
# rio
SRCS+= poll_immediate.c
@@ -93,6 +96,8 @@
${LCRYPTO_SRC}/crypto/hashtable \
${LCRYPTO_SRC}/crypto/rbtree \
${LCRYPTO_SRC}/crypto/siphash \
+ ${LCRYPTO_SRC}/crypto/thread \
+ ${LCRYPTO_SRC}/crypto/thread/arch \
${LCRYPTO_SRC}/ssl \
${LCRYPTO_SRC}/ssl/quic \
${LCRYPTO_SRC}/ssl/record \

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 8, 9:36 PM (3 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
40331923
Default Alt Text
D60395.diff (3 KB)

Event Timeline