[src/trunk]: src Redo the sshsk_sign() stuff properly, but putting the helper...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src Redo the sshsk_sign() stuff properly, but putting the helper...
From: christos <christos%NetBSD.org@localhost>
Date: Sun, 01 Mar 2020 23:47:53 +0000
details:   https://anonhg.NetBSD.org/src/rev/23991e261075
branches:  trunk
changeset: 745423:23991e261075
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Mar 01 20:59:52 2020 +0000

description:
Redo the sshsk_sign() stuff properly, but putting the helper in libssh.so

diffstat:

 crypto/external/bsd/openssh/bin/scp/Makefile               |   3 +--
 crypto/external/bsd/openssh/bin/sftp-server/Makefile       |   5 ++---
 crypto/external/bsd/openssh/bin/sftp/Makefile              |   4 ++--
 crypto/external/bsd/openssh/bin/ssh-add/Makefile           |   3 +--
 crypto/external/bsd/openssh/bin/ssh-agent/Makefile         |   4 ++--
 crypto/external/bsd/openssh/bin/ssh-keygen/Makefile        |   4 ++--
 crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile       |   4 ++--
 crypto/external/bsd/openssh/bin/ssh-keysign/Makefile       |   4 ++--
 crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile |   3 +--
 crypto/external/bsd/openssh/bin/ssh/Makefile               |   5 ++---
 crypto/external/bsd/openssh/bin/sshd/Makefile              |   5 ++---
 crypto/external/bsd/openssh/lib/Makefile                   |   3 ++-
 distrib/evbarm/instkernel/sshramdisk/Makefile              |  12 ++----------
 distrib/evbarm/instkernel/sshramdisk/list                  |   4 ++--
 lib/libpam/modules/pam_ssh/Makefile                        |   4 ++--
 rescue/Makefile                                            |   7 +++----
 16 files changed, 30 insertions(+), 44 deletions(-)

diffs (276 lines):

diff -r d73c7d1ce687 -r 23991e261075 crypto/external/bsd/openssh/bin/scp/Makefile
--- a/crypto/external/bsd/openssh/bin/scp/Makefile      Sun Mar 01 20:24:07 2020 +0000
+++ b/crypto/external/bsd/openssh/bin/scp/Makefile      Sun Mar 01 20:59:52 2020 +0000
@@ -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>
diff -r d73c7d1ce687 -r 23991e261075 crypto/external/bsd/openssh/bin/sftp-server/Makefile
--- a/crypto/external/bsd/openssh/bin/sftp-server/Makefile      Sun Mar 01 20:24:07 2020 +0000
+++ b/crypto/external/bsd/openssh/bin/sftp-server/Makefile      Sun Mar 01 20:59:52 2020 +0000
@@ -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>
diff -r d73c7d1ce687 -r 23991e261075 crypto/external/bsd/openssh/bin/sftp/Makefile
--- a/crypto/external/bsd/openssh/bin/sftp/Makefile     Sun Mar 01 20:24:07 2020 +0000
+++ b/crypto/external/bsd/openssh/bin/sftp/Makefile     Sun Mar 01 20:59:52 2020 +0000
@@ -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
diff -r d73c7d1ce687 -r 23991e261075 crypto/external/bsd/openssh/bin/ssh-add/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh-add/Makefile  Sun Mar 01 20:24:07 2020 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh-add/Makefile  Sun Mar 01 20:59:52 2020 +0000
@@ -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>
diff -r d73c7d1ce687 -r 23991e261075 crypto/external/bsd/openssh/bin/ssh-agent/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh-agent/Makefile        Sun Mar 01 20:24:07 2020 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh-agent/Makefile        Sun Mar 01 20:59:52 2020 +0000
@@ -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}
 
diff -r d73c7d1ce687 -r 23991e261075 crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile       Sun Mar 01 20:24:07 2020 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile       Sun Mar 01 20:59:52 2020 +0000
@@ -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
 
diff -r d73c7d1ce687 -r 23991e261075 crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile      Sun Mar 01 20:24:07 2020 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh-keyscan/Makefile      Sun Mar 01 20:59:52 2020 +0000
@@ -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>
diff -r d73c7d1ce687 -r 23991e261075 crypto/external/bsd/openssh/bin/ssh-keysign/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh-keysign/Makefile      Sun Mar 01 20:24:07 2020 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh-keysign/Makefile      Sun Mar 01 20:59:52 2020 +0000
@@ -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>
diff -r d73c7d1ce687 -r 23991e261075 crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile        Sun Mar 01 20:24:07 2020 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile        Sun Mar 01 20:59:52 2020 +0000
@@ -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>
diff -r d73c7d1ce687 -r 23991e261075 crypto/external/bsd/openssh/bin/ssh/Makefile
--- a/crypto/external/bsd/openssh/bin/ssh/Makefile      Sun Mar 01 20:24:07 2020 +0000
+++ b/crypto/external/bsd/openssh/bin/ssh/Makefile      Sun Mar 01 20:59:52 2020 +0000
@@ -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 @@
 
 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
diff -r d73c7d1ce687 -r 23991e261075 crypto/external/bsd/openssh/bin/sshd/Makefile
--- a/crypto/external/bsd/openssh/bin/sshd/Makefile     Sun Mar 01 20:24:07 2020 +0000
+++ b/crypto/external/bsd/openssh/bin/sshd/Makefile     Sun Mar 01 20:59:52 2020 +0000
@@ -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 @@
        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
diff -r d73c7d1ce687 -r 23991e261075 crypto/external/bsd/openssh/lib/Makefile
--- a/crypto/external/bsd/openssh/lib/Makefile  Sun Mar 01 20:24:07 2020 +0000
+++ b/crypto/external/bsd/openssh/lib/Makefile  Sun Mar 01 20:59:52 2020 +0000
@@ -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 @@
 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 \
diff -r d73c7d1ce687 -r 23991e261075 distrib/evbarm/instkernel/sshramdisk/Makefile
--- a/distrib/evbarm/instkernel/sshramdisk/Makefile     Sun Mar 01 20:24:07 2020 +0000
+++ b/distrib/evbarm/instkernel/sshramdisk/Makefile     Sun Mar 01 20:59:52 2020 +0000
@@ -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 @@
                ${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
diff -r d73c7d1ce687 -r 23991e261075 distrib/evbarm/instkernel/sshramdisk/list
--- a/distrib/evbarm/instkernel/sshramdisk/list Sun Mar 01 20:24:07 2020 +0000
+++ b/distrib/evbarm/instkernel/sshramdisk/list Sun Mar 01 20:59:52 2020 +0000
@@ -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 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
diff -r d73c7d1ce687 -r 23991e261075 lib/libpam/modules/pam_ssh/Makefile
--- a/lib/libpam/modules/pam_ssh/Makefile       Sun Mar 01 20:24:07 2020 +0000
+++ b/lib/libpam/modules/pam_ssh/Makefile       Sun Mar 01 20:59:52 2020 +0000
@@ -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 @@
 .PATH: ${SSHSRC}
 LIB=   pam_ssh
 MAN=   pam_ssh.8
-SRCS=  pam_ssh.c ssh-sk-client.c
+SRCS=  pam_ssh.c
 
 CPPFLAGS+= -I${SSHSRC}
 
diff -r d73c7d1ce687 -r 23991e261075 rescue/Makefile
--- a/rescue/Makefile   Sun Mar 01 20:24:07 2020 +0000
+++ b/rescue/Makefile   Sun Mar 01 20:59:52 2020 +0000
@@ -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 @@
 #      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
Prev by Date: [src/trunk]: src/tests/lib/libc/sys fix variable name
Next by Date: [src/trunk]: src/sys/kern child_return():
Previous by Thread: [src/trunk]: src/tests/lib/libc/sys fix variable name
Next by Thread: [src/trunk]: src/sys/kern child_return():
Indexes:
Home | Main Index | Thread Index | Old Index