kgess-mirror/freebsd-src
1
0
Fork 0
mirror of https://git.freebsd.org/src.git synced 2026-01-11 19:57:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

secure: Adapt Makefile to ssh-sk-client everywhere

Browse source 
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
This commit is contained in:
Jose Luis Duran 2025-04-17 19:08:02 +00:00
parent 8c6bf983a9
commit 65d8491719
No known key found for this signature in database
GPG key ID: 5415E244477475CC
11 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
secure/lib/libssh/Makefile
View file

@ -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

2
secure/libexec/ssh-keysign/Makefile
View file

@ -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

2
secure/libexec/ssh-pkcs11-helper/Makefile
View file

@ -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

2
secure/libexec/sshd-session/Makefile
View file

@ -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

1
secure/ssh.mk
View file

@ -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

2
secure/usr.bin/ssh-add/Makefile
View file

@ -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

2
secure/usr.bin/ssh-agent/Makefile
View file

@ -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

3
secure/usr.bin/ssh-keygen/Makefile
View file

@ -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

2
secure/usr.bin/ssh-keyscan/Makefile
View file

@ -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

2
secure/usr.bin/ssh/Makefile
View file

@ -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

3
secure/usr.sbin/sshd/Makefile
View file

@ -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