Date: Fri, 8 Oct 2021 21:26:40 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 0e4489e41778 - stable/13 - Revert "Disable MK_OPENSSL_KTLS for stable/13." Message-ID: <202110082126.198LQeMG028968@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0e4489e4177861c8ac76af91a3a9599eb46660a7 commit 0e4489e4177861c8ac76af91a3a9599eb46660a7 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2021-10-08 18:28:23 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2021-10-08 18:28:23 +0000 Revert "Disable MK_OPENSSL_KTLS for stable/13." No further issues with the KTLS support in OpenSSL have been seen since the serf/apache bugs which motivated disabling KTLS. In addition, the KTLS API in OpenSSL is now finalized since it has been released in OpenSSL 3.0. This reverts commit 3cf25a7802a26ae3be9159c585fda6aea3d0dc08. Approved by: jkim (maintainer), emaste Sponsored by: Netflix --- share/mk/src.opts.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 77c60aef0bc4..6bc8ef0672a1 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -210,7 +210,6 @@ __DEFAULT_NO_OPTIONS = \ LOADER_VERIEXEC_PASS_MANIFEST \ OFED_EXTRA \ OPENLDAP \ - OPENSSL_KTLS \ RPCBIND_WARMSTART_SUPPORT \ SORT_THREADS \ SVN \ @@ -330,6 +329,13 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110082126.198LQeMG028968>