git: 3cf25a7802a2 - stable/13 - Disable MK_OPENSSL_KTLS for stable/13.
John Baldwin
jhb at FreeBSD.org
Fri Feb 5 00:04:37 UTC 2021
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=3cf25a7802a26ae3be9159c585fda6aea3d0dc08
commit 3cf25a7802a26ae3be9159c585fda6aea3d0dc08
Author: John Baldwin <jhb at FreeBSD.org>
AuthorDate: 2021-02-04 21:40:25 +0000
Commit: John Baldwin <jhb at FreeBSD.org>
CommitDate: 2021-02-05 00:03:21 +0000
Disable MK_OPENSSL_KTLS for stable/13.
Due to the pending release of 13.0 and the recent bug in serf exposed
by the KTLS changes, disable OpenSSL's KTLS by default. This keeps
crypto/openssl in sync with main while lowering the risk of introducing
instability into 13.0.
Discussed with: gjb (re), jkim, emaste (secteam)
---
share/mk/src.opts.mk | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 75405c1bc050..d01472c7fae6 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -212,6 +212,7 @@ __DEFAULT_NO_OPTIONS = \
LOADER_VERIEXEC_PASS_MANIFEST \
OFED_EXTRA \
OPENLDAP \
+ OPENSSL_KTLS \
RPCBIND_WARMSTART_SUPPORT \
SORT_THREADS \
SVN \
@@ -330,13 +331,6 @@ BROKEN_OPTIONS+=LOADER_UBOOT
BROKEN_OPTIONS+=LOADER_GELI LOADER_LUA
.endif
-# Kernel TLS is enabled by default on amd64
-.if ${__T} == "amd64"
-__DEFAULT_YES_OPTIONS+=OPENSSL_KTLS
-.else
-__DEFAULT_NO_OPTIONS+=OPENSSL_KTLS
-.endif
-
.if ${__T:Mmips64*}
# profiling won't work on MIPS64 because there is only assembly for o32
BROKEN_OPTIONS+=PROFILE
More information about the dev-commits-src-all
mailing list