From nobody Fri Oct 08 21:26:40 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EEC9217EBC5C; Fri, 8 Oct 2021 21:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HR1Tr6Rbsz4Rhb; Fri, 8 Oct 2021 21:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B9C5C6728; Fri, 8 Oct 2021 21:26:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 198LQeHG028969; Fri, 8 Oct 2021 21:26:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 198LQeMG028968; Fri, 8 Oct 2021 21:26:40 GMT (envelope-from git) Date: Fri, 8 Oct 2021 21:26:40 GMT Message-Id: <202110082126.198LQeMG028968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0e4489e41778 - stable/13 - Revert "Disable MK_OPENSSL_KTLS for stable/13." List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0e4489e4177861c8ac76af91a3a9599eb46660a7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0e4489e4177861c8ac76af91a3a9599eb46660a7 commit 0e4489e4177861c8ac76af91a3a9599eb46660a7 Author: John Baldwin AuthorDate: 2021-10-08 18:28:23 +0000 Commit: John Baldwin 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