From nobody Thu Aug 21 16:28:09 2025 X-Original-To: dev-commits-src-all@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 4c77zG35xtz65Mq1; Thu, 21 Aug 2025 16:28:10 +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 4c77zF5DT3z3T5m; Thu, 21 Aug 2025 16:28:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755793689; 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=ys1n5DfrNxwbOFPk8uAnG/PxHVs+ljkhNQVR5Y616jA=; b=RnkAW3MTFxb2a0rhJw3vRaZsay6Yf8oq+KZsZseBvxENK1NeXQgUz06r6H+d+Y2qdI+NiP mxhms+Ew4y0FtvZMC7HCJnpyKA99ZFz6qt1twVYWD5nVF1G5WgUgfaCIA9i2oIIjJ9xUHn NRojkE1wOLDEy8px5rniUtN4ps27GhtHHbuTA7Xz93k+s9ba4FJ+AgvrvjBGZn0bGkwsAr iEpjYFEedQrarDM4wG6YwCRc8r87wFmjiyYyOzU3AM9+CDZfYyTUsmq52xr+BqfQ+r5X4w 33y/U4baPs7u/cfu2Ns+DMobUR11dRU7WnaHbzRPsoDOjmjVblIQvZERtl76ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755793689; 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=ys1n5DfrNxwbOFPk8uAnG/PxHVs+ljkhNQVR5Y616jA=; b=g89D9U3z4nld+HAv101E869iOZ2waH+1AnWexKp7Lz8+PPi/TuSRa8QaywJaRLI5lngJFA Rgh2O9jVg/N0UoD6WL8zr5aaYh1ODeUsNKSSNDbff2BLRiZPbMY0LPhcHdfL7m0iBp+v0C htrkcYcPReSyGRRxX9Xk1va6n3/7Mr3WQBMqd/tbtuNoo1pTCyec59oR5YFfg63cEs6A42 7qQEJvDL54+ZGsjee+QO/XqGE2A/zP2V27pct1SsCqREVOC+546ldQIZf94HPEFn4S1+9p /d8IAh7NcbhfwkuATu5avhezbFBv44eRcBzRZdE5B+Cp34peIwBDJcjP8VbJyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755793689; a=rsa-sha256; cv=none; b=rSC6cP0mRT8jDna+HvkTAIpNMCkMpOX3jyL+IA6I4kNqhiIvKLJaX232M8tPFNMsgclnhg jAjAXfNGFPw/oSm+EUxKMnDVtAf8x/fh50JXDg7NiKzOgutX4N2Tp9uw9pC1RkFWQcKcc1 oFyG6ST8nGtkptoWeeG/wjf3FG6ZqLa7WPU5KInfy+cvuOWQ338vskNkcLDAAdLv0HaC63 xsMKvH/okc3BeXM859Vq7WDP5My3HlhgCQjTLDeMxLvlXU46DX5WV/MOc0OyV6ygTPKbTO NTCcYGg5X1usVKICdfSf3vfZB9Jpwy+TqE6F0S7pEsOfV3ksDee2WYxnnYOs7w== 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 4c77zF4qRKz15pP; Thu, 21 Aug 2025 16:28:09 +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 57LGS9JY020427; Thu, 21 Aug 2025 16:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57LGS9qL020424; Thu, 21 Aug 2025 16:28:09 GMT (envelope-from git) Date: Thu, 21 Aug 2025 16:28:09 GMT Message-Id: <202508211628.57LGS9qL020424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 439685ee69e4 - main - libssl: unbreak building the library with KTLS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 439685ee69e4fc066df5c54f802248d8e3805605 Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=439685ee69e4fc066df5c54f802248d8e3805605 commit 439685ee69e4fc066df5c54f802248d8e3805605 Author: Enji Cooper AuthorDate: 2025-08-21 16:18:30 +0000 Commit: Enji Cooper CommitDate: 2025-08-21 16:28:02 +0000 libssl: unbreak building the library with KTLS The 3.5.1 update dropped a `SRCS` entry for the MK_OPENSSL_KTLS != no case (the source was renamed from `ktls.c` to `ktls_meth.c`). Add the new file to SRCS in order to unbreak linking the library when KTLS is enabled. This bug isn't apparent now because KTLS is always disabled in `include/openssl/configuration.h` (this will be fixed soon). Found when doing `make universe` with KTLS enabled in `include/openssl/configuration.h`. Fixes: 4757b351ea9d59d ("openssl: Import version 3.5.1") --- secure/lib/libssl/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index 45f23c9e9ca2..682c7bbc2693 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -73,6 +73,8 @@ SRCS+= rio_notifier.c poll_builder.c .if ${MK_OPENSSL_KTLS} == "no" CFLAGS+=-DOPENSSL_NO_KTLS +.else +SRCS+= ktls_meth.c .endif LIBADD= crypto