Module Name: src
Committed By: christos
Date: Sun Mar 1 20:59:54 UTC 2020
Modified Files:
src/crypto/external/bsd/openssh/bin/scp: Makefile
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/crypto/external/bsd/openssh/bin/sftp-server: Makefile
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/bin/ssh-add: Makefile
src/crypto/external/bsd/openssh/bin/ssh-agent: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keyscan: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keysign: Makefile
src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/lib: Makefile
src/distrib/evbarm/instkernel/sshramdisk: Makefile list
src/lib/libpam/modules/pam_ssh: Makefile
src/rescue: Makefile
Log Message:
Redo the sshsk_sign() stuff properly, but putting the helper in libssh.so
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/bin/scp/Makefile
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssh/bin/sftp-server/Makefile
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/bin/ssh-add/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssh/bin/ssh-keysign/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.22 -r1.23 src/distrib/evbarm/instkernel/sshramdisk/Makefile
cvs rdiff -u -r1.3 -r1.4 src/distrib/evbarm/instkernel/sshramdisk/list
cvs rdiff -u -r1.12 -r1.13 src/lib/libpam/modules/pam_ssh/Makefile
cvs rdiff -u -r1.40 -r1.41 src/rescue/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/bin/scp/Makefile
diff -u src/crypto/external/bsd/openssh/bin/scp/Makefile:1.2 src/crypto/external/bsd/openssh/bin/scp/Makefile:1.3
--- src/crypto/external/bsd/openssh/bin/scp/Makefile:1.2 Wed Feb 26 19:24:38 2020
+++ src/crypto/external/bsd/openssh/bin/scp/Makefile Sun Mar 1 15:59:52 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2020/02/27 00:24:38 christos Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/01 20:59:52 christos Exp $
BINDIR=/usr/bin
PROG= scp
-SRCS= scp.c ssh-sk-client.c
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/bin/sftp/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.8 src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.9
--- src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.8 Wed Feb 26 19:24:38 2020
+++ src/crypto/external/bsd/openssh/bin/sftp/Makefile Sun Mar 1 15:59:52 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2020/02/27 00:24:38 christos Exp $
+# $NetBSD: Makefile,v 1.9 2020/03/01 20:59:52 christos Exp $
BINDIR= /usr/bin
PROG= sftp
-SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c ssh-sk-client.c
+SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c
MAN= sftp.1
LDADD+= -ledit -lterminfo
Index: src/crypto/external/bsd/openssh/bin/sftp-server/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sftp-server/Makefile:1.3 src/crypto/external/bsd/openssh/bin/sftp-server/Makefile:1.4
--- src/crypto/external/bsd/openssh/bin/sftp-server/Makefile:1.3 Wed Feb 26 19:24:39 2020
+++ src/crypto/external/bsd/openssh/bin/sftp-server/Makefile Sun Mar 1 15:59:52 2020
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2020/02/27 00:24:39 christos Exp $
+# $NetBSD: Makefile,v 1.4 2020/03/01 20:59:52 christos Exp $
BINDIR= /usr/libexec
PROG= sftp-server
-SRCS= sftp-server.c sftp-common.c sftp-server-main.c sftp-realpath.c \
- ssh-sk-client.c
+SRCS= sftp-server.c sftp-common.c sftp-server-main.c sftp-realpath.c
MAN= sftp-server.8
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.16 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.17
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.16 Wed Feb 26 19:24:39 2020
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Sun Mar 1 15:59:53 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2020/02/27 00:24:39 christos Exp $
+# $NetBSD: Makefile,v 1.17 2020/03/01 20:59:53 christos Exp $
.include <bsd.own.mk>
@@ -6,8 +6,7 @@ BINDIR = /usr/bin
PROG= ssh
SRCS= ssh.c readconf.c clientloop.c sshtty.c \
- sshconnect.c sshconnect2.c mux.c auth.c \
- ssh-sk-client.c
+ sshconnect.c sshconnect2.c mux.c auth.c
COPTS.auth.c= -DHOST_ONLY
COPTS.mux.c= -Wno-pointer-sign
Index: src/crypto/external/bsd/openssh/bin/ssh-add/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-add/Makefile:1.2 src/crypto/external/bsd/openssh/bin/ssh-add/Makefile:1.3
--- src/crypto/external/bsd/openssh/bin/ssh-add/Makefile:1.2 Wed Feb 26 19:24:39 2020
+++ src/crypto/external/bsd/openssh/bin/ssh-add/Makefile Sun Mar 1 15:59:53 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2020/02/27 00:24:39 christos Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/01 20:59:53 christos Exp $
BINDIR=/usr/bin
PROG= ssh-add
-SRCS= ssh-add.c ssh-sk-client.c
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile:1.4 src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile:1.5
--- src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile:1.4 Wed Feb 26 19:24:39 2020
+++ src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile Sun Mar 1 15:59:53 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2020/02/27 00:24:39 christos Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/01 20:59:53 christos Exp $
BINDIR=/usr/bin
PROG= ssh-agent
-SRCS= ssh-agent.c ssh-pkcs11-client.c ssh-sk-client.c
+SRCS= ssh-agent.c ssh-pkcs11-client.c
COPTS.ssh-agent.c+= ${GCC_NO_FORMAT_TRUNCATION}
Index: src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.7 src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.8
--- src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.7 Wed Feb 26 19:24:39 2020
+++ src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile Sun Mar 1 15:59:53 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2020/02/27 00:24:39 christos Exp $
+# $NetBSD: Makefile,v 1.8 2020/03/01 20:59:53 christos Exp $
BINDIR= /usr/bin
PROG= ssh-keygen
-SRCS= ssh-keygen.c moduli.c sshsig.c ssh-sk-client.c
+SRCS= ssh-keygen.c moduli.c sshsig.c
COPTS.ssh-keygen.c= -Wno-pointer-sign
Index: src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile:1.4 src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile:1.5
--- src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile:1.4 Wed Feb 26 19:24:39 2020
+++ src/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile Sun Mar 1 15:59:53 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2020/02/27 00:24:39 christos Exp $
+# $NetBSD: Makefile,v 1.5 2020/03/01 20:59:53 christos Exp $
BINDIR= /usr/bin
PROG= ssh-keyscan
-SRCS= ssh-keyscan.c ssh_api.c kexgexs.c ssh-sk-client.c
+SRCS= ssh-keyscan.c ssh_api.c kexgexs.c
MAN= ssh-keyscan.1
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/bin/ssh-keysign/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-keysign/Makefile:1.2 src/crypto/external/bsd/openssh/bin/ssh-keysign/Makefile:1.3
--- src/crypto/external/bsd/openssh/bin/ssh-keysign/Makefile:1.2 Wed Feb 26 19:24:39 2020
+++ src/crypto/external/bsd/openssh/bin/ssh-keysign/Makefile Sun Mar 1 15:59:53 2020
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2020/02/27 00:24:39 christos Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/01 20:59:53 christos Exp $
BINOWN= root
BINMODE=4555
BINDIR= /usr/libexec
PROG= ssh-keysign
-SRCS= ssh-keysign.c readconf.c ssh-sk-client.c
+SRCS= ssh-keysign.c readconf.c
MAN= ssh-keysign.8
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile:1.2 src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile:1.3
--- src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile:1.2 Wed Feb 26 19:24:39 2020
+++ src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile Sun Mar 1 15:59:53 2020
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2020/02/27 00:24:39 christos Exp $
+# $NetBSD: Makefile,v 1.3 2020/03/01 20:59:53 christos Exp $
BINOWN= root
BINMODE=555
BINDIR= /usr/libexec
PROG= ssh-pkcs11-helper
-SRCS= ssh-pkcs11-helper.c ssh-sk-client.c
MAN= ssh-pkcs11-helper.8
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/openssh/bin/sshd/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.20 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.21
--- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.20 Wed Feb 26 19:24:39 2020
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Sun Mar 1 15:59:53 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2020/02/27 00:24:39 christos Exp $
+# $NetBSD: Makefile,v 1.21 2020/03/01 20:59:53 christos Exp $
.include <bsd.own.mk>
@@ -15,8 +15,7 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c
auth2-none.c auth2-passwd.c auth2-pubkey.c \
monitor.c monitor_wrap.c \
kexgexs.c sftp-server.c sftp-common.c \
- sftp-realpath.c sandbox-rlimit.c pfilter.c \
- ssh-sk-client.c
+ sftp-realpath.c sandbox-rlimit.c pfilter.c
COPTS.auth-options.c+= -Wno-pointer-sign
COPTS.ldapauth.c+= -Wno-format-nonliteral # XXX: should fix
Index: src/crypto/external/bsd/openssh/lib/Makefile
diff -u src/crypto/external/bsd/openssh/lib/Makefile:1.32 src/crypto/external/bsd/openssh/lib/Makefile:1.33
--- src/crypto/external/bsd/openssh/lib/Makefile:1.32 Sat Feb 29 15:44:15 2020
+++ src/crypto/external/bsd/openssh/lib/Makefile Sun Mar 1 15:59:53 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2020/02/29 20:44:15 mgorny Exp $
+# $NetBSD: Makefile,v 1.33 2020/03/01 20:59:53 christos Exp $
.include <bsd.own.mk>
@@ -59,6 +59,7 @@ sntrup4591761.c \
ssh-ed25519.c \
ssh-ed25519-sk.c \
ssh-pkcs11.c \
+ssh-sk-client.c \
ssh-xmss.c \
sshbuf-getput-basic.c \
sshbuf-getput-crypto.c \
Index: src/distrib/evbarm/instkernel/sshramdisk/Makefile
diff -u src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.22 src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.23
--- src/distrib/evbarm/instkernel/sshramdisk/Makefile:1.22 Fri Feb 28 08:00:51 2020
+++ src/distrib/evbarm/instkernel/sshramdisk/Makefile Sun Mar 1 15:59:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2020/02/28 13:00:51 christos Exp $
+# $NetBSD: Makefile,v 1.23 2020/03/01 20:59:54 christos Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -31,18 +31,10 @@ IMAGEDEPENDS= ${CRUNCHBIN} \
${DISTRIBDIR}/common/services
IMAGEPREBUILD= ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pp ${DESTDIR}/libdata/firmware ${WORKDIR}
-.PATH: ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
-liboverride.o: ssh-sk-client.o
- ${_MKTARGET_LINK}
- ${LD} -r -o ${.TARGET} ${.ALLSRC}
-
-CLEANFILES+= liboverride.o ssh-sk-client.o
-
-
# Use stubs to eliminate some large stuff from libc
HACKSRC= ${DISTRIBDIR}/utils/libhack
.include "${HACKSRC}/Makefile.inc"
-${CRUNCHBIN}: libhack.o liboverride.o
+${CRUNCHBIN}: libhack.o
USE_PAM := no
USE_YP := no
Index: src/distrib/evbarm/instkernel/sshramdisk/list
diff -u src/distrib/evbarm/instkernel/sshramdisk/list:1.3 src/distrib/evbarm/instkernel/sshramdisk/list:1.4
--- src/distrib/evbarm/instkernel/sshramdisk/list:1.3 Fri Feb 28 08:00:51 2020
+++ src/distrib/evbarm/instkernel/sshramdisk/list Sun Mar 1 15:59:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.3 2020/02/28 13:00:51 christos Exp $
+# $NetBSD: list,v 1.4 2020/03/01 20:59:54 christos Exp $
SRCDIRS bin sbin external/bsd/less/bin crypto/external/bsd/openssh/bin/sshd usr.bin usr.sbin
@@ -69,7 +69,7 @@ SPECIAL umount srcdir distrib/utils/x_u
SPECIAL sshd srcdir crypto/external/bsd/openssh/bin/sshd
SPECIAL sshd keepsymbols allow_severity deny_severity
-LIBS libhack.o liboverride.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop -lssh -lcrypto -lwrap
+LIBS libhack.o -ledit -lutil -lcurses -lterminfo -lrmt -lcrypt -ll -lm -lz -lprop -lssh -lcrypto -lwrap
# init invokes the shell as -sh
ARGVLN sh -sh
Index: src/lib/libpam/modules/pam_ssh/Makefile
diff -u src/lib/libpam/modules/pam_ssh/Makefile:1.12 src/lib/libpam/modules/pam_ssh/Makefile:1.13
--- src/lib/libpam/modules/pam_ssh/Makefile:1.12 Sun Mar 1 09:50:43 2020
+++ src/lib/libpam/modules/pam_ssh/Makefile Sun Mar 1 15:59:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/03/01 14:50:43 christos Exp $
+# $NetBSD: Makefile,v 1.13 2020/03/01 20:59:54 christos Exp $
# PAM module for SSH
# $FreeBSD: src/lib/libpam/modules/pam_ssh/Makefile,v 1.18 2004/08/06 07:27:04 cperciva Exp $
@@ -13,7 +13,7 @@ SSHSRC= ${NETBSDSRCDIR}/crypto/external/
.PATH: ${SSHSRC}
LIB= pam_ssh
MAN= pam_ssh.8
-SRCS= pam_ssh.c ssh-sk-client.c
+SRCS= pam_ssh.c
CPPFLAGS+= -I${SSHSRC}
Index: src/rescue/Makefile
diff -u src/rescue/Makefile:1.40 src/rescue/Makefile:1.41
--- src/rescue/Makefile:1.40 Thu Feb 27 12:17:34 2020
+++ src/rescue/Makefile Sun Mar 1 15:59:54 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2020/02/27 17:17:34 christos Exp $
+# $NetBSD: Makefile,v 1.41 2020/03/01 20:59:54 christos Exp $
NOLIBCSANITIZER= # defined
NOSANITIZER= # defined
@@ -57,9 +57,8 @@ PARSELISTENV+= SMB_LIBDIR=${SMB_LIBDIR}
# various library functions
#
-OVERRIDEOBJS= rcmd.o ssh-sk-client.o
-.PATH: ${NETBSDSRCDIR}/lib/libc/net \
- ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
+OVERRIDEOBJS= rcmd.o
+.PATH: ${NETBSDSRCDIR}/lib/libc/net
CPPFLAGS.rcmd.c+=-I${NETBSDSRCDIR}/lib/libc/include -DRESCUEDIR=\"${RESCUEDIR}\"
LIBOVERRIDE= liboverride.o
