Page MenuHomeFreeBSD
Files F151914056

D49793.id153561.diff
No OneTemporary
Actions

D49793.id153561.diff
View Options

diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -4,9 +4,27 @@
LIB= ssh
PRIVATELIB= true
SHLIB_MAJOR= 5
-SRCS= ssh_api.c ssherr.c \
- sshbuf.c sshkey.c sshbuf-getput-basic.c \
- sshbuf-misc.c sshbuf-getput-crypto.c krl.c bitmap.c
+SRCS= ssh_api.c \
+ ssherr.c \
+ sshbuf.c \
+ sshkey.c \
+ sshbuf-getput-basic.c \
+ sshbuf-misc.c \
+ sshbuf-getput-crypto.c \
+ krl.c \
+ bitmap.c
+
+# PQC XMSS keys support (experimental)
+#SRCS+= ssh-xmss.c \
+# sshkey-xmss.c \
+# xmss_commons.c \
+# xmss_fast.c \
+# xmss_hash.c \
+# xmss_hash_address.c \
+# xmss_wots.c
+
+# gss-genr.c should be in $SRCS but causes linking problems, so it is
+# compiled directly into sshd instead.
SRCS+= authfd.c authfile.c \
canohost.c channels.c cipher.c cipher-aes.c cipher-aesctr.c \
cleanup.c \
@@ -30,9 +48,6 @@
PACKAGE= ssh
-# gss-genr.c should be in $SRCS but causes linking problems, so it is
-# compiled directly into sshd instead.
-
# Portability layer
SRCS+= bcrypt_pbkdf.c blowfish.c bsd-misc.c bsd-signal.c explicit_bzero.c \
fmt_scaled.c freezero.c glob.c \
diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile
--- a/secure/libexec/sftp-server/Makefile
+++ b/secure/libexec/sftp-server/Makefile
@@ -1,8 +1,8 @@
.include <src.opts.mk>
.include "${SRCTOP}/secure/ssh.mk"
-PROG= sftp-server
-SRCS= sftp-server.c sftp-common.c sftp-server-main.c
+PROG= sftp-server
+SRCS= sftp-common.c sftp-server.c sftp-server-main.c
MAN= sftp-server.8
LIBADD= ssh
diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile
--- 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.c ssh-pkcs11-helper.c
+SRCS= ssh-pkcs11-helper.c ssh-pkcs11.c
MAN= ssh-pkcs11-helper.8
LIBADD= crypto ssh
diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile
--- a/secure/usr.bin/scp/Makefile
+++ b/secure/usr.bin/scp/Makefile
@@ -2,7 +2,8 @@
.include "${SRCTOP}/secure/ssh.mk"
PROG= scp
-SRCS= scp.c sftp-common.c sftp-client.c sftp-glob.c progressmeter.c
+SRCS= scp.c progressmeter.c
+SRCS+= sftp-common.c sftp-client.c sftp-glob.c
PACKAGE= ssh
LIBADD= ssh
diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile
--- a/secure/usr.bin/sftp/Makefile
+++ b/secure/usr.bin/sftp/Makefile
@@ -2,8 +2,8 @@
.include "${SRCTOP}/secure/ssh.mk"
PROG= sftp
-SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c sftp-usergroup.c \
- progressmeter.c
+SRCS= sftp.c sftp-usergroup.c progressmeter.c
+SRCS+= sftp-common.c sftp-client.c sftp-glob.c
PACKAGE= ssh
LIBADD= ssh edit
diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile
--- a/secure/usr.bin/ssh-add/Makefile
+++ b/secure/usr.bin/ssh-add/Makefile
@@ -2,7 +2,8 @@
.include "${SRCTOP}/secure/ssh.mk"
PROG= ssh-add
-SRCS+= ssh-add.c ssh-sk-client.c
+SRCS= ssh-add.c
+SRCS+= ssh-sk-client.c
PACKAGE= ssh
LIBADD= ssh
diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile
--- a/secure/usr.bin/ssh-keygen/Makefile
+++ b/secure/usr.bin/ssh-keygen/Makefile
@@ -2,8 +2,8 @@
.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
+SRCS+= ssh-sk-client.c
PACKAGE= ssh
LIBADD= crypto ssh

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 12, 12:29 PM (19 h, 22 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31332646
Default Alt Text
D49793.id153561.diff (3 KB)

Event Timeline