From nobody Thu Apr 17 19:19:51 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 4ZdnlW4J6Zz5sdZx; Thu, 17 Apr 2025 19:19:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZdnlW1y6Zz3X0H; Thu, 17 Apr 2025 19:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744917591; 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=hHDlN9UnTvElE5uwEdqhpbYr7wC/cHVzOO8a2QybUfA=; b=aQfx6+ivRYLb7JVXlTt58oGyFgSfefN2VMc+hx480MysuweMxaQl4wqka7K0yIDoUQooNR 9Cj1U4lx3DAXLPMRHIeGA/mo2x87003lpsxgGLarKMa7XpXGma10bsZdmdue9g9UGIgFM5 GQzTjGr5H0/1N4N8fiemCduh0fYyAqMBZoS0VjtwPmRmUS4ZVSB7Y024PQM4o9RytSK1EI O45Yt7qOYIe93TIIQ+QCOTRKh02E2oRdDtSwJyqegoW8DfD7RT4RO3I60LOUqYm0AhFA88 KHWwe6+CiVn0PpjwznFiR+b06vV8RC6YxXfLUhG3C2q6NmgNm/yFOjSI7HY0VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744917591; a=rsa-sha256; cv=none; b=byQ9X7ngaNKhySpK3tXEcn0/TdMLR5Zvs2CnTIYN9WCYF6wXcNjSxF8TmUFRrh/2s3C4ZN vU5YNU48owrjzGgMKdcSdl1x09Fv0ufMaH3qXMdLquS7gGZPUpakWkVYsVGmK1mPmHki5O Xfaz02Bxg55OfxA2HZiP47EVhlV5VSeluGn+y7SBDe5G/+UyiOUxUmoBhscpLvOL7EpdEE axjdnP9gf36XnxEvxG02jeHuAqd/Ak5LRaA09703mx/gu+s+oMwuHdbC3GoYaQyPfgVDxJ FU20RiyV1h0s+oQ1Cv7MW3z1TY3EkDT72Cg8aXNm6E7W9JLGpc0HHE28W3Syvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744917591; 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=hHDlN9UnTvElE5uwEdqhpbYr7wC/cHVzOO8a2QybUfA=; b=QZ4QxeBC0jvPjUi3uOtQOAYJqMWh5c2Li3kURP7Xef2rra+WuefslLMexuq86nhGgiuA/C 8bdUJK5FgtxQvS9ZyvxocumAyTVZPeN9G4D1tYuSLAqsIIDViqaeiomN6qiJNKWAozqIR+ Ads1r6cNz+BOTQMmvwJToeCp1b1boLRnFi7Qm5Li6E//ehecE1yGmQ6hcCYtevNmeFd2jT VYtTp4hArTkMdPHEFspLCPP5ksEABtoqidUmBrIi0FVFjni5pVI84c1AdA7TW949JvPoeu 8eeYYiLEZByi93eVSYN9bRewZ5y6hJpBhjQeB0ic4m8HZVQTEDrejXtcBKl0IA== 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 4ZdnlW1NHKz119K; Thu, 17 Apr 2025 19:19:51 +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 53HJJpdT004407; Thu, 17 Apr 2025 19:19:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53HJJpBR004404; Thu, 17 Apr 2025 19:19:51 GMT (envelope-from git) Date: Thu, 17 Apr 2025 19:19:51 GMT Message-Id: <202504171919.53HJJpBR004404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: 65d8491719bb - main - secure: Adapt Makefile to ssh-sk-client everywhere 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: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65d8491719bbc88ed45637d2381931c2d29cfe87 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=65d8491719bbc88ed45637d2381931c2d29cfe87 commit 65d8491719bbc88ed45637d2381931c2d29cfe87 Author: Jose Luis Duran AuthorDate: 2025-04-17 19:08:02 +0000 Commit: Jose Luis Duran CommitDate: 2025-04-17 19:12:39 +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 --- secure/lib/libssh/Makefile | 1 - secure/libexec/ssh-keysign/Makefile | 2 +- secure/libexec/ssh-pkcs11-helper/Makefile | 2 +- secure/libexec/sshd-session/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 ++- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index f4c60c02c9eb..39083d007675 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -38,7 +38,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 e66ed527affd..0ec54697aa81 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -2,7 +2,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 90b15eef26d8..9c276ef266f9 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -2,7 +2,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/libexec/sshd-session/Makefile b/secure/libexec/sshd-session/Makefile index 81e481559189..e9e106fe90bd 100644 --- a/secure/libexec/sshd-session/Makefile +++ b/secure/libexec/sshd-session/Makefile @@ -15,7 +15,7 @@ SRCS= sshd-session.c auth-rhosts.c auth-passwd.c \ sftp-server.c sftp-common.c \ sandbox-null.c sandbox-rlimit.c sandbox-systrace.c sandbox-darwin.c \ sandbox-seccomp-filter.c sandbox-capsicum.c sandbox-pledge.c \ - sandbox-solaris.c uidswap.c + sandbox-solaris.c uidswap.c $(SKSRCS) PACKAGE= ssh # gss-genr.c really belongs in libssh; see src/secure/lib/libssh/Makefile 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 935badfda561..e6913cd9d0d6 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -7,7 +7,8 @@ PROG= sshd SRCS= sshd.c \ platform-listen.c \ servconf.c sshpty.c srclimit.c groupaccess.c auth2-methods.c \ - dns.c fatal.c compat.c utf8.c authfd.c canohost.c + dns.c fatal.c compat.c utf8.c authfd.c canohost.c \ + $(SKSRCS) PACKAGE= ssh MAN= sshd.8 sshd_config.5