From nobody Mon Oct 05 19:33:04 2026 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 4hz8gN60sYz6vHv1 for ; Mon, 05 Oct 2026 19:33:04 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hz8gN3k6dz4rZy for ; Mon, 05 Oct 2026 19:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791228784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qDce9Zk1n9+BaRiOtfdbW5+I3lI3HrtCySZi6a42K4A=; b=ctlal18G2E8yj8if5yfIANDwfHVmxkhN0klLyOubBJVhWjyhEj6J/eV00PUup1bJuHoJP3 gKXT6guQ+CH+eP1CjdBOMb7Tzkfambe7VQf1NiJsQuouBw/tJ92SykOk/gsws1AkElFUv6 EvWs17qxrH+PbqLNGTXDx4mFi84aDEk7avzc6MrNFGPvqVJ4U0Q+/kwlx8NhVVIUzmQzss U27LSj5gZhpVcSvSglGBPI8Act3Y9/4SjERuexzZDJC63raPPo8jh1HB7lTtNz7+ZP2Szt vtAJxm0jzm22yiPTolw5F0SKi0h5SXDJJu1UV72hE+8TmMxotfYohVUVLiwiWQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791228784; b=t9JEugdTEHkWh8PfwbBoTABMNNnl7uylECjYLmYL+jTtYtOE9wNFpwKZPotGI8gf9Cjyoo Dye1lNZeUmA4+A6CA5sjLYKXcFFc9waPl2cXcEdanvvF0nv4VrsM8AFTvhk8tOXSPghlkX m59CZyPO6VyYaqre/Jz+sTRhiBDfMTVHbmnkWnApQC2dljWyikQP6y9LF5bdhKhvG9I9yU cbGrIyGgEwXDOs/Bb4CpWnr0rtLmFKtWfCYAWbY3wifJemMhQcxmjno/4IbMEifhaPun5c ha9Hid+xAdQMtphO/7dgqRM/gcYv2983nkQ3wLNDINJnGl1sVkBBqNjKgUCPxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791228784; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qDce9Zk1n9+BaRiOtfdbW5+I3lI3HrtCySZi6a42K4A=; b=qdmCOH9FuDgACkheR7oZ7SMgHoUdoXQYdOI9WoNdijVlkpKKeCOsgn81YmFrvKn9S323P0 yD8KmTbUrZguLH1qcPksBlnQZw/DoEnC63fUYnF4dJJzQylp9g0MEz/5cbKH0pHS+eKgJp CEjAEca+XwA1yl2ZWAs4bHYUwYVrMRIfW4L8zjgmAc3tu5p8lNr6ClgvDwRX6DvYLC6sAw CwoY4Wih17JwVT0WT3rFdUlBc4cVsqmsqtkwK9NCX+Ef340ws/e8TFI8ieMVKjmeP0JdIs OF6ybUz5RSt4fzhf9P8xgj8HzQ/wRNv5Xmzmg+ZIigafNT2p6qGwkL4Cypcn5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hz8gN1HgGzZWc for ; Mon, 05 Oct 2026 19:33:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 412a1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 05 Oct 2026 19:33:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Jose Luis Duran From: Ed Maste Subject: git: 01f93565ff8e - stable/14 - secure: Adapt Makefile to ssh-sk-client everywhere 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 01f93565ff8e91ed9074d32f119d77fb40edc63a Auto-Submitted: auto-generated Date: Mon, 05 Oct 2026 19:33:04 +0000 Message-Id: <6ac3fb70.412a1.7cd5d68c@gitrepo.freebsd.org> The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=01f93565ff8e91ed9074d32f119d77fb40edc63a commit 01f93565ff8e91ed9074d32f119d77fb40edc63a Author: Jose Luis Duran AuthorDate: 2025-04-17 19:08:02 +0000 Commit: Ed Maste CommitDate: 2026-10-05 19:32:38 +0000 secure: Adapt Makefile to ssh-sk-client everywhere Upstream commit 7b47b40b1 ("adapt Makefile to ssh-sk-client everywhere") adapted the Makefiles to ssh-sk-client. Do the same here. Reviewed by: emaste Approved by: emaste (mentor) Differential Revision: https://reviews.freebsd.org/D49795 (cherry picked from commit 65d8491719bbc88ed45637d2381931c2d29cfe87) --- secure/lib/libssh/Makefile | 1 - secure/libexec/ssh-keysign/Makefile | 2 +- secure/libexec/ssh-pkcs11-helper/Makefile | 2 +- secure/ssh.mk | 1 + secure/usr.bin/ssh-add/Makefile | 2 +- secure/usr.bin/ssh-agent/Makefile | 2 +- secure/usr.bin/ssh-keygen/Makefile | 3 +-- secure/usr.bin/ssh-keyscan/Makefile | 2 +- secure/usr.bin/ssh/Makefile | 2 +- secure/usr.sbin/sshd/Makefile | 3 ++- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 0a95c401c52f..65c9b06cd573 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -39,7 +39,6 @@ SRCS= ${LIBOPENSSH_SRCS} \ kexsntrup761x25519.c kexmlkem768x25519.c sntrup761.c kexgen.c \ sftp-realpath.c platform-pledge.c platform-tracing.c platform-misc.c \ sshbuf-io.c -SRCS+= ssh-sk-client.c PACKAGE= ssh diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index 129b34199fad..e3fc783264d7 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -3,7 +3,7 @@ .include "${SRCTOP}/secure/ssh.mk" PROG= ssh-keysign -SRCS= ssh-keysign.c readconf.c uidswap.c +SRCS= ssh-keysign.c readconf.c uidswap.c $(SKSRCS) MAN= ssh-keysign.8 BINMODE=4555 diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile index 34fb59381305..88fc7553882a 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -3,7 +3,7 @@ .include "${SRCTOP}/secure/ssh.mk" PROG= ssh-pkcs11-helper -SRCS= ssh-pkcs11-helper.c ssh-pkcs11.c +SRCS= ssh-pkcs11-helper.c ssh-pkcs11.c $(SKSRCS) MAN= ssh-pkcs11-helper.8 LIBADD= crypto ssh diff --git a/secure/ssh.mk b/secure/ssh.mk index 641343ac993a..84d9a7f57032 100644 --- a/secure/ssh.mk +++ b/secure/ssh.mk @@ -5,6 +5,7 @@ SSHDIR= ${SRCTOP}/crypto/openssh SFTP_CLIENT_SRCS=sftp-common.c sftp-client.c sftp-glob.c +SKSRCS= ssh-sk-client.c CFLAGS+= -I${SSHDIR} -include ssh_namespace.h diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 8de508bd6c12..c908881ca2e9 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -2,7 +2,7 @@ .include "${SRCTOP}/secure/ssh.mk" PROG= ssh-add -SRCS= ssh-add.c ssh-sk-client.c +SRCS= ssh-add.c $(SKSRCS) PACKAGE= ssh LIBADD= ssh diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 06abc627fcd5..49d5fe77e943 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -2,7 +2,7 @@ .include "${SRCTOP}/secure/ssh.mk" PROG= ssh-agent -SRCS= ssh-agent.c ssh-pkcs11-client.c +SRCS= ssh-agent.c ssh-pkcs11-client.c $(SKSRCS) PACKAGE= ssh LIBADD= crypto ssh diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 89e61e68ee55..c9205e71d219 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -2,8 +2,7 @@ .include "${SRCTOP}/secure/ssh.mk" PROG= ssh-keygen -# XXX ssh-sk-client.c in libssh maybe? -SRCS= ssh-keygen.c sshsig.c ssh-sk-client.c +SRCS= ssh-keygen.c sshsig.c $(SKSRCS) PACKAGE= ssh LIBADD= crypto ssh diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index baa7f54b048d..522e47411011 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -2,7 +2,7 @@ .include "${SRCTOP}/secure/ssh.mk" PROG= ssh-keyscan -SRCS= ssh-keyscan.c +SRCS= ssh-keyscan.c $(SKSRCS) PACKAGE= ssh LIBADD= ssh diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index df85f47d5975..acb1fd4eaa25 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -10,7 +10,7 @@ MLINKS= ssh.1 slogin.1 PACKAGE= ssh SRCS= ssh.c readconf.c clientloop.c sshtty.c \ - sshconnect.c sshconnect2.c mux.c + sshconnect.c sshconnect2.c mux.c $(SKSRCS) # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile SRCS+= gss-genr.c diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index 23a053f27ae7..79ee4f330eba 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -6,7 +6,8 @@ CONFSDIR= /etc/ssh PROG= sshd SRCS= sshd.c \ platform-listen.c \ - servconf.c sshpty.c srclimit.c groupaccess.c auth2-methods.c + servconf.c sshpty.c srclimit.c groupaccess.c auth2-methods.c \ + $(SKSRCS) PACKAGE= ssh MAN= sshd.8 sshd_config.5