From nobody Thu Sep 4 13:29:26 2025 X-Original-To: dev-commits-src-main@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 4cHgLZ2k95z66204; Thu, 04 Sep 2025 13:29:26 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cHgLZ23Y6z3RNd; Thu, 04 Sep 2025 13:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756992566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cAVBKMDsK5dr5BKr1roW3VEhEE8jg3Z+f8j038ClNBs=; b=YR98pultuzPIMIvKqvi0bHBfRzHJD3iVDUOSfyMXQ8hjJYYLyGNzDD4kirOW00nw3Et4Cr BaEkdhPHAy7pHa1cm/fclp2HU6FbOa8RjGGddjlPKnlshGqcB8aw1a7vBsKP9909vuULSX em7MV9YhWx8lHQrzhROhl4AckX7izK8lyIo7EUs4Go45tkn+FiC1ZMcu+6WkvpDiAoDC98 5lVMgve13BYQ3ou93mhASmf1i88ae1smU+xPq5dRGVmKs8b7fhel49FbRjZcP06RH1ZyV+ XDd/Map8Xf72QvSJOhM0IjHz4fCLIDmPybm9hEBcdoS2fiL9Xy5X6UdRMPdphg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756992566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cAVBKMDsK5dr5BKr1roW3VEhEE8jg3Z+f8j038ClNBs=; b=j8Dm1n0KonxVX8TiIXuFIFlszPyzGGcoG4GDNK02mPYa+LEJyEULl+jSB6lnqKmVd5UyW2 Cwd7jpocfd3PjC7ayq0hM2MfFk4ckgclOXl5cMDue/lxkNHFBj4drAhEeTlUDCYBODLrUA KNYPjXhfw8/o6vQSASAeGgnAH7KNR9Q8cWcgrCvK9LLYSJltlCRMFQOT/AOujfMVs/PEpj EgfRqW4YdvcIHTXekQ44/RsG24S0C+mSwzXCXOWvVCaFp32IWCXG2NzQOGZ+7y26w9ObN4 Aoch/A4YsMElxsvqEOGL3E+dJduJggJLMik7NgQ3sRigI6Tv/EMLcNOVYhy0bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756992566; a=rsa-sha256; cv=none; b=CxD3mTqJHN3QJpYXtNiuEZ8SvGNwKzahe4GiNyJ8VqhYB/TeGs7yqUD2DxwvP8RyuHdFQ8 r3hO0++RGvFy3ijEwGvx2YPF5nkA8sLf3yE+4TReEz1UGDHGm6KTi6juB0ii1G/irgj688 ApXu0q8sU/NT8ltqw81ZjuvLJDQVd4ZdzZNTqO157nCRbOsXuNj8K7BprTCnjzj2VcP5BS 6yzU6G/Rts6nYW0QIzhNRTVXSLBTnEJ93v83OUCpaoNkmazHSeisZXxFCjnrLEDd5CONlB VtPeg93X1MBybkSAiGY41Dn+OI3Wvw0XupGH2g9OyRO/vwKefoFM4I4PjRmTFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cHgLZ1f1Vz14VB; Thu, 04 Sep 2025 13:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 584DTQWg094877; Thu, 4 Sep 2025 13:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 584DTQem094874; Thu, 4 Sep 2025 13:29:26 GMT (envelope-from git) Date: Thu, 4 Sep 2025 13:29:26 GMT Message-Id: <202509041329.584DTQem094874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 407c4d1eeb80 - main - openssl: Disable KTLS in bootstrap libraries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 407c4d1eeb80caadcf24e60b827ea6686d3adf3a Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=407c4d1eeb80caadcf24e60b827ea6686d3adf3a commit 407c4d1eeb80caadcf24e60b827ea6686d3adf3a Author: Mark Johnston AuthorDate: 2025-09-04 13:28:39 +0000 Commit: Mark Johnston CommitDate: 2025-09-04 13:28:39 +0000 openssl: Disable KTLS in bootstrap libraries We need to build OpenSSL when bootstrapping certctl. On MacOS ktls_enable() isn't defined anywhere, so without this the build fails. We don't need KTLS in the bootstrap library, so just disable it. Reviewed by: khorben, ngie Differential Revision: https://reviews.freebsd.org/D52341 --- secure/lib/libcrypto/Makefile | 3 ++- secure/lib/libssl/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index f8f8d291ee9e..75ebb6e65327 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -649,10 +649,11 @@ _cmd1=/%%NO_ASM%%/d .else _cmd1=s/%%NO_ASM%%// .endif -.if ${MK_OPENSSL_KTLS} != "no" +.if ${MK_OPENSSL_KTLS} != "no" && !defined(BOOTSTRAPPING) _cmd2=/%%NO_KTLS%%/d .else _cmd2=s/%%NO_KTLS%%// +CFLAGS+= -DOPENSSL_NO_KTLS .endif buildinf.h: Makefile diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index acb63549c1c8..b0ca31644279 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -70,7 +70,7 @@ SRSC+= tls_pad.c SRCS+= poll_immediate.c SRCS+= rio_notifier.c poll_builder.c -.if ${MK_OPENSSL_KTLS} == "no" +.if ${MK_OPENSSL_KTLS} == "no" || defined(BOOTSTRAPPING) CFLAGS+=-DOPENSSL_NO_KTLS .else SRCS+= ktls_meth.c