ssh/lib hasn't worked towards our code-sharing goals for a quit while,

perhaps it is too verbose?  Change each */Makefile to specifying exactly
what sources that program requires, compiling it seperate.  Maybe we'll
iterate by sorting those into seperatable chunks, splitting up files
which contain common code + server/client specific code, or whatnot. But
this isn't one step, or we'd have done it a long time ago..
ok dtucker markus djm

14 files changed, 166 insertions, 139 deletions

diff --git a/usr.bin/ssh/Makefile b/usr.bin/ssh/Makefile
index cef9c962dc2..b88be95492f 100644
--- a/usr.bin/ssh/Makefile
+++ b/usr.bin/ssh/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.15 2010/02/09 08:55:31 markus Exp $
+#	$OpenBSD: Makefile,v 1.16 2017/12/10 19:37:57 deraadt Exp $
 
 .include <bsd.own.mk>
 
-SUBDIR=	lib ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
+SUBDIR=	ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
 	ssh-keysign ssh-keyscan sftp ssh-pkcs11-helper
 
 distribution:
diff --git a/usr.bin/ssh/Makefile.inc b/usr.bin/ssh/Makefile.inc
index 4962ae662c4..4db9181f098 100644
--- a/usr.bin/ssh/Makefile.inc
+++ b/usr.bin/ssh/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.55 2017/06/02 06:06:10 djm Exp $
+#	$OpenBSD: Makefile.inc,v 1.56 2017/12/10 19:37:57 deraadt Exp $
 
 .include <bsd.own.mk>
 
@@ -38,13 +38,3 @@ CFLAGS+=	-DHAVE_DLOPEN
 .endif
 
 .include <bsd.obj.mk>
-
-.if exists(${.CURDIR}/../lib/${__objdir})
-LDADD+=         -L${.CURDIR}/../lib/${__objdir} -lssh
-DPADD+=         ${.CURDIR}/../lib/${__objdir}/libssh.a
-.else
-LDADD+=         -L${.CURDIR}/../lib -lssh
-DPADD+=         ${.CURDIR}/../lib/libssh.a
-.endif
-
-LDADD+=		-lutil
diff --git a/usr.bin/ssh/lib/Makefile b/usr.bin/ssh/lib/Makefile
deleted file mode 100644
index 76b31fcffc8..00000000000
--- a/usr.bin/ssh/lib/Makefile
+++ /dev/null
@@ -1,78 +0,0 @@
-#	$OpenBSD: Makefile,v 1.89 2017/07/01 13:50:45 djm Exp $
-
-.PATH:		${.CURDIR}/..
-.include "${.CURDIR}/../Makefile.inc"
-
-LIB=	ssh
-
-# These are files intended for a standalone libopenssh in the future.
-LIB_SRCS= \
-	ssh_api.c \
-	ssherr.c \
-	sshbuf.c \
-	sshbuf-getput-basic.c \
-	sshbuf-misc.c \
-	sshkey.c \
-	bitmap.c \
-	krl.c
-
-.if (${OPENSSL:L} == "yes")
-LIB_SRCS+=	sshbuf-getput-crypto.c digest-openssl.c
-.else
-LIB_SRCS+=	digest-libc.c
-.endif
-
-SRCS=	${LIB_SRCS} \
-	authfd.c authfile.c bufaux.c buffer.c canohost.c \
-	channels.c cipher.c \
-	cleanup.c compat.c crc32.c fatal.c \
-	hostfile.c log.c match.c nchan.c packet.c opacket.c readpass.c \
-	ttymodes.c xmalloc.c atomicio.c \
-	key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c utf8.c \
-	msg.c progressmeter.c dns.c \
-	monitor_fdpass.c addrmatch.c \
-	smult_curve25519_ref.c \
-	kexc25519.c kexc25519c.c kexc25519s.c \
-	chacha.c poly1305.c cipher-chachapoly.c ssh-ed25519.c hmac.c umac.c
-
-.if (${OPENSSL:L} == "yes")
-SRCS+=	bufec.c bufbn.c \
-	ssh-dss.c ssh-rsa.c ssh-ecdsa.c dh.c \
-	kexdh.c kexgex.c kexecdh.c \
-	kexdhc.c kexgexc.c kexecdhc.c \
-	kexdhs.c kexgexs.c kexecdhs.c \
-	ssh-pkcs11.c
-.else
-SRCS+=	rijndael.c cipher-aesctr.c
-.endif
-
-# ed25519, from supercop
-SRCS+=	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c
-
-SRCS+=	umac128.c
-CLEANFILES+=   umac128.c
-umac128.c: umac.c Makefile
-	sed \
-	    -e "s/^#define UMAC_OUTPUT_LEN     8/#define UMAC_OUTPUT_LEN 16/" \
-	    -e s/umac_new/umac128_new/g \
-	    -e s/umac_update/umac128_update/g \
-	    -e s/umac_final/umac128_final/g \
-	    -e s/umac_delete/umac128_delete/g \
-	    < ${.CURDIR}/../umac.c > ${.TARGET}
-
-NOPROFILE= yes
-NOPIC=	yes
-
-install:
-	@echo -n
-
-.include <bsd.own.mk>
-
-# .if (${KERBEROS5:L} == "yes")
-# CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
-
-# SRCS+= gss-genr.c
-# CFLAGS+= -DGSSAPI
-# .endif # KERBEROS5
-
-.include <bsd.lib.mk>
diff --git a/usr.bin/ssh/scp/Makefile b/usr.bin/ssh/scp/Makefile
index 4aaed127ed2..ff6baa43a33 100644
--- a/usr.bin/ssh/scp/Makefile
+++ b/usr.bin/ssh/scp/Makefile
@@ -1,7 +1,11 @@
-#	$OpenBSD: Makefile,v 1.17 2017/07/10 14:09:59 espie Exp $
+#	$OpenBSD: Makefile,v 1.18 2017/12/10 19:37:57 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
+SRCS=	scp.c
+SRCS+=	atomicio.c cleanup.c fatal.c log.c misc.c progressmeter.c \
+	sshbuf-getput-basic.c sshbuf.c ssherr.c uidswap.c utf8.c xmalloc.c
+
 PROG=	scp
 BINOWN=	root
 
diff --git a/usr.bin/ssh/sftp-server/Makefile b/usr.bin/ssh/sftp-server/Makefile
index bb9fb0d7a89..7a18d738e9c 100644
--- a/usr.bin/ssh/sftp-server/Makefile
+++ b/usr.bin/ssh/sftp-server/Makefile
@@ -1,7 +1,11 @@
-#	$OpenBSD: Makefile,v 1.9 2013/07/02 13:32:38 markus Exp $
+#	$OpenBSD: Makefile,v 1.10 2017/12/10 19:37:57 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
+SRCS=	sftp-server.c sftp-common.c sftp-server-main.c
+SRCS+=	addrmatch.c fatal.c log.c match.c misc.c sshbuf-getput-basic.c \
+	sshbuf.c ssherr.c uidswap.c xmalloc.c
+
 PROG=	sftp-server
 BINOWN=	root
 
@@ -10,8 +14,6 @@ BINMODE?=555
 BINDIR=	/usr/libexec
 MAN=	sftp-server.8
 
-SRCS=	sftp-server.c sftp-common.c sftp-server-main.c
-
 LDADD+=	-lutil
 DPADD+= ${LIBUTIL}
 
diff --git a/usr.bin/ssh/sftp/Makefile b/usr.bin/ssh/sftp/Makefile
index 3b1063475c0..102c6d32a9b 100644
--- a/usr.bin/ssh/sftp/Makefile
+++ b/usr.bin/ssh/sftp/Makefile
@@ -1,7 +1,11 @@
-#	$OpenBSD: Makefile,v 1.13 2017/07/10 14:09:59 espie Exp $
+#	$OpenBSD: Makefile,v 1.14 2017/12/10 19:37:57 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
+SRCS=	sftp.c sftp-client.c sftp-common.c sftp-glob.c
+SRCS+=	atomicio.c cleanup.c fatal.c log.c misc.c progressmeter.c \
+	sshbuf-getput-basic.c sshbuf.c ssherr.c uidswap.c utf8.c xmalloc.c
+
 PROG=	sftp
 BINOWN=	root
 
@@ -9,8 +13,6 @@ BINMODE?=555
 
 BINDIR=	/usr/bin
 
-SRCS=	sftp.c sftp-client.c sftp-common.c sftp-glob.c
-
 .include <bsd.prog.mk>
 
 LDADD+=	-ledit -ltermcap -lutil
diff --git a/usr.bin/ssh/ssh-add/Makefile b/usr.bin/ssh/ssh-add/Makefile
index a6b2c78a147..ee388ab3d5b 100644
--- a/usr.bin/ssh/ssh-add/Makefile
+++ b/usr.bin/ssh/ssh-add/Makefile
@@ -1,7 +1,15 @@
-#	$OpenBSD: Makefile,v 1.21 2017/07/10 14:09:59 espie Exp $
+#	$OpenBSD: Makefile,v 1.22 2017/12/10 19:37:57 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
+SRCS=	ssh-add.c
+SRCS+=	addrmatch.c atomicio.c authfd.c authfile.c bitmap.c blocks.c chacha.c \
+	cipher-chachapoly.c cipher.c cleanup.c digest-openssl.c ed25519.c \
+	fatal.c fe25519.c ge25519.c hash.c krl.c log.c match.c misc.c \
+	poly1305.c readpass.c sc25519.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c \
+	ssh-rsa.c sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c \
+	sshbuf.c ssherr.c sshkey.c uidswap.c verify.c xmalloc.c
+
 PROG=	ssh-add
 BINOWN=	root
 
@@ -11,5 +19,5 @@ BINDIR=	/usr/bin
 
 .include <bsd.prog.mk>
 
-LDADD+=	-lcrypto
-DPADD+= ${LIBCRYPTO}
+LDADD+=	-lcrypto -lutil
+DPADD+= ${LIBCRYPTO} ${LIBUTIL}
diff --git a/usr.bin/ssh/ssh-agent/Makefile b/usr.bin/ssh/ssh-agent/Makefile
index bfdc7d28830..b81d25e05c9 100644
--- a/usr.bin/ssh/ssh-agent/Makefile
+++ b/usr.bin/ssh/ssh-agent/Makefile
@@ -1,7 +1,15 @@
-#	$OpenBSD: Makefile,v 1.25 2017/07/10 14:09:59 espie Exp $
+#	$OpenBSD: Makefile,v 1.26 2017/12/10 19:37:57 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
+SRCS=	ssh-agent.c ssh-pkcs11-client.c
+SRCS+=	addrmatch.c atomicio.c authfile.c bitmap.c blocks.c bufaux.c buffer.c \
+	chacha.c cipher-chachapoly.c cipher.c compat.c digest-openssl.c \
+	ed25519.c fatal.c fe25519.c ge25519.c hash.c key.c krl.c log.c match.c \
+	misc.c poly1305.c readpass.c sc25519.c ssh-dss.c ssh-ecdsa.c \
+	ssh-ed25519.c ssh-rsa.c sshbuf-getput-basic.c sshbuf-getput-crypto.c \
+	sshbuf-misc.c sshbuf.c ssherr.c sshkey.c uidswap.c verify.c xmalloc.c
+
 PROG=	ssh-agent
 BINOWN=	root
 BINGRP=	_sshagnt
@@ -10,9 +18,8 @@ BINMODE?=2555
 
 BINDIR=	/usr/bin
 
-SRCS=	ssh-agent.c ssh-pkcs11-client.c
-
 .include <bsd.prog.mk>
 
-LDADD+=	-lcrypto
-DPADD+=	${LIBCRYPTO}
+LDADD+=	-lcrypto -lutil
+DPADD+=	${LIBCRYPTO} ${LIBUTIL}
+
diff --git a/usr.bin/ssh/ssh-keygen/Makefile b/usr.bin/ssh/ssh-keygen/Makefile
index 08e84b2e513..9966310c70b 100644
--- a/usr.bin/ssh/ssh-keygen/Makefile
+++ b/usr.bin/ssh/ssh-keygen/Makefile
@@ -1,7 +1,16 @@
-#	$OpenBSD: Makefile,v 1.23 2017/07/10 14:09:59 espie Exp $
+#	$OpenBSD: Makefile,v 1.24 2017/12/10 19:37:57 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
+SRCS=	ssh-keygen.c moduli.c
+SRCS+=	addrmatch.c atomicio.c authfd.c authfile.c bitmap.c blocks.c chacha.c \
+	cipher-chachapoly.c cipher.c cleanup.c digest-openssl.c dns.c \
+	ed25519.c fatal.c fe25519.c ge25519.c hash.c hmac.c hostfile.c krl.c \
+	log.c match.c misc.c poly1305.c readpass.c sc25519.c ssh-dss.c \
+	ssh-ecdsa.c ssh-ed25519.c ssh-pkcs11.c ssh-rsa.c sshbuf-getput-basic.c \
+	sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c ssherr.c sshkey.c \
+	uidswap.c utf8.c uuencode.c verify.c xmalloc.c
+
 PROG=	ssh-keygen
 BINOWN=	root
 
@@ -9,9 +18,8 @@ BINMODE?=555
 
 BINDIR=	/usr/bin
 
-SRCS=	ssh-keygen.c moduli.c
-
 .include <bsd.prog.mk>
 
-LDADD+=	-lcrypto
-DPADD+=	${LIBCRYPTO}
+LDADD+=	-lcrypto -lutil
+DPADD+=	${LIBCRYPTO} ${LIBUTIL}
+
diff --git a/usr.bin/ssh/ssh-keyscan/Makefile b/usr.bin/ssh/ssh-keyscan/Makefile
index e7d6965a2fc..6363e52722f 100644
--- a/usr.bin/ssh/ssh-keyscan/Makefile
+++ b/usr.bin/ssh/ssh-keyscan/Makefile
@@ -1,7 +1,29 @@
-#	$OpenBSD: Makefile,v 1.7 2017/07/10 14:09:59 espie Exp $
+#	$OpenBSD: Makefile,v 1.8 2017/12/10 19:37:57 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
+SRCS=	ssh-keyscan.c
+
+umac128.c: umac.c
+	sed \
+	    -e "s/^#define UMAC_OUTPUT_LEN     8/#define UMAC_OUTPUT_LEN 16/" \
+	    -e s/umac_new/umac128_new/g \
+	    -e s/umac_update/umac128_update/g \
+	    -e s/umac_final/umac128_final/g \
+	    -e s/umac_delete/umac128_delete/g \
+	    < ${.CURDIR}/../umac.c > ${.TARGET}
+
+SRCS+=	addrmatch.c atomicio.c blocks.c canohost.c chacha.c \
+	cipher-chachapoly.c cipher.c cleanup.c compat.c dh.c digest-openssl.c \
+	dispatch.c ed25519.c fe25519.c ge25519.c hash.c hmac.c hostfile.c \
+	kex.c kexc25519.c kexc25519c.c kexc25519s.c kexdh.c kexdhc.c kexdhs.c \
+	kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c kexgexs.c log.c \
+	mac.c match.c misc.c packet.c poly1305.c sc25519.c \
+	smult_curve25519_ref.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c ssh-rsa.c \
+	ssh_api.c sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c \
+	sshbuf.c ssherr.c sshkey.c uidswap.c umac.c umac128.c verify.c \
+	xmalloc.c
+
 PROG=	ssh-keyscan
 BINOWN=	root
 
@@ -11,5 +33,6 @@ BINDIR=	/usr/bin
 
 .include <bsd.prog.mk>
 
-LDADD+= -lcrypto -lz
-DPADD+= ${LIBCRYPTO} ${LIBZ}
+LDADD+= -lcrypto -lz -lutil
+DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBUTIL}
+
diff --git a/usr.bin/ssh/ssh-keysign/Makefile b/usr.bin/ssh/ssh-keysign/Makefile
index aef8b822743..274674806f4 100644
--- a/usr.bin/ssh/ssh-keysign/Makefile
+++ b/usr.bin/ssh/ssh-keysign/Makefile
@@ -1,7 +1,26 @@
-#	$OpenBSD: Makefile,v 1.9 2016/01/14 16:17:40 markus Exp $
+#	$OpenBSD: Makefile,v 1.10 2017/12/10 19:37:57 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
+SRCS=	ssh-keysign.c readconf.c
+
+umac128.c: umac.c
+	sed \
+	    -e "s/^#define UMAC_OUTPUT_LEN     8/#define UMAC_OUTPUT_LEN 16/" \
+	    -e s/umac_new/umac128_new/g \
+	    -e s/umac_update/umac128_update/g \
+	    -e s/umac_final/umac128_final/g \
+	    -e s/umac_delete/umac128_delete/g \
+	    < ${.CURDIR}/../umac.c > ${.TARGET}
+
+SRCS+=	addrmatch.c atomicio.c authfile.c bitmap.c blocks.c canohost.c \
+	chacha.c cipher-chachapoly.c cipher.c cleanup.c digest-openssl.c \
+	dispatch.c ed25519.c fatal.c fe25519.c ge25519.c hash.c hmac.c kex.c \
+	krl.c log.c mac.c match.c misc.c msg.c packet.c poly1305.c sc25519.c \
+	ssh-dss.c ssh-ecdsa.c ssh-ed25519.c ssh-rsa.c sshbuf-getput-basic.c \
+	sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c ssherr.c sshkey.c \
+	uidswap.c umac.c umac128.c verify.c xmalloc.c
+
 PROG=	ssh-keysign
 BINOWN=	root
 
@@ -10,8 +29,6 @@ BINMODE?=4555
 BINDIR=	/usr/libexec
 MAN=	ssh-keysign.8
 
-SRCS=	ssh-keysign.c readconf.c
-
 .include <bsd.prog.mk>
 
 LDADD+=	-lcrypto -lutil -lz
diff --git a/usr.bin/ssh/ssh-pkcs11-helper/Makefile b/usr.bin/ssh/ssh-pkcs11-helper/Makefile
index 7cd1b3b8785..bb5e19f5b86 100644
--- a/usr.bin/ssh/ssh-pkcs11-helper/Makefile
+++ b/usr.bin/ssh/ssh-pkcs11-helper/Makefile
@@ -1,7 +1,15 @@
-#	$OpenBSD: Makefile,v 1.2 2010/02/09 08:25:32 markus Exp $
+#	$OpenBSD: Makefile,v 1.3 2017/12/10 19:37:57 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
 
+SRCS=	ssh-pkcs11-helper.c ssh-pkcs11.c
+SRCS+=	addrmatch.c atomicio.c authfile.c bitmap.c blocks.c bufaux.c buffer.c \
+	chacha.c cipher-chachapoly.c cipher.c compat.c digest-openssl.c \
+	ed25519.c fatal.c fe25519.c ge25519.c hash.c key.c krl.c log.c match.c \
+	misc.c poly1305.c readpass.c sc25519.c ssh-dss.c ssh-ecdsa.c \
+	ssh-ed25519.c ssh-rsa.c sshbuf-getput-basic.c sshbuf-getput-crypto.c \
+	sshbuf-misc.c sshbuf.c ssherr.c sshkey.c uidswap.c verify.c xmalloc.c
+
 PROG=	ssh-pkcs11-helper
 BINOWN=	root
 
@@ -10,9 +18,8 @@ BINMODE?=555
 BINDIR=	/usr/libexec
 MAN=	ssh-pkcs11-helper.8
 
-SRCS=	ssh-pkcs11-helper.c ssh-pkcs11.c
-
 .include <bsd.prog.mk>
 
-LDADD+=	-lcrypto
-DPADD+=	${LIBCRYPTO}
+LDADD+=	-lcrypto -lutil
+DPADD+=	${LIBCRYPTO} ${LIBUTIL}
+
diff --git a/usr.bin/ssh/ssh/Makefile b/usr.bin/ssh/ssh/Makefile
index 52c4dbd577b..604c89712a4 100644
--- a/usr.bin/ssh/ssh/Makefile
+++ b/usr.bin/ssh/ssh/Makefile
@@ -1,7 +1,30 @@
-#	$OpenBSD: Makefile,v 1.67 2017/04/30 23:17:37 djm Exp $
+#	$OpenBSD: Makefile,v 1.68 2017/12/10 19:37:57 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
-.include "${.CURDIR}/../Makefile.inc"
+
+SRCS=	ssh.c readconf.c clientloop.c sshtty.c sshconnect.c sshconnect2.c mux.c
+
+umac128.c: umac.c
+	sed \
+	    -e "s/^#define UMAC_OUTPUT_LEN     8/#define UMAC_OUTPUT_LEN 16/" \
+	    -e s/umac_new/umac128_new/g \
+	    -e s/umac_update/umac128_update/g \
+	    -e s/umac_final/umac128_final/g \
+	    -e s/umac_delete/umac128_delete/g \
+	    < ${.CURDIR}/../umac.c > ${.TARGET}
+
+SRCS+=	addrmatch.c atomicio.c authfd.c authfile.c bitmap.c blocks.c bufaux.c \
+	bufbn.c bufec.c buffer.c canohost.c chacha.c channels.c \
+	cipher-chachapoly.c cipher.c compat.c crc32.c dh.c digest-openssl.c \
+	dispatch.c dns.c ed25519.c fatal.c fe25519.c ge25519.c hash.c hmac.c \
+	hostfile.c kex.c kexc25519.c kexc25519c.c kexc25519s.c kexdh.c \
+	kexdhc.c kexdhs.c kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c \
+	key.c krl.c log.c mac.c match.c misc.c monitor_fdpass.c msg.c nchan.c \
+	opacket.c packet.c poly1305.c progressmeter.c readpass.c sc25519.c \
+	smult_curve25519_ref.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c \
+	ssh-pkcs11.c ssh-rsa.c sshbuf-getput-basic.c sshbuf-getput-crypto.c \
+	sshbuf-misc.c sshbuf.c ssherr.c sshkey.c ttymodes.c uidswap.c umac.c \
+	umac128.c utf8.c uuencode.c verify.c xmalloc.c
 
 PROG=	ssh
 BINOWN=	root
@@ -11,9 +34,6 @@ BINOWN=	root
 BINDIR=	/usr/bin
 MAN=	ssh.1 ssh_config.5
 
-SRCS=	ssh.c readconf.c clientloop.c sshtty.c \
-	sshconnect.c sshconnect2.c mux.c
-
 .include <bsd.own.mk>
 
 KERBEROS5=no
diff --git a/usr.bin/ssh/sshd/Makefile b/usr.bin/ssh/sshd/Makefile
index 979c0618001..79b53c5e541 100644
--- a/usr.bin/ssh/sshd/Makefile
+++ b/usr.bin/ssh/sshd/Makefile
@@ -1,7 +1,34 @@
-#	$OpenBSD: Makefile,v 1.90 2016/09/28 16:33:07 djm Exp $
+#	$OpenBSD: Makefile,v 1.91 2017/12/10 19:37:57 deraadt Exp $
 
 .PATH:		${.CURDIR}/..
-.include "${.CURDIR}/../Makefile.inc"
+
+SRCS=	sshd.c auth-rhosts.c auth-passwd.c sshpty.c sshlogin.c servconf.c \
+	serverloop.c auth.c auth2.c auth-options.c session.c auth2-chall.c \
+	groupaccess.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
+	auth2-none.c auth2-passwd.c auth2-pubkey.c monitor.c monitor_wrap.c \
+	sftp-server.c sftp-common.c sandbox-pledge.c
+
+umac128.c: umac.c
+	sed \
+	    -e "s/^#define UMAC_OUTPUT_LEN     8/#define UMAC_OUTPUT_LEN 16/" \
+	    -e s/umac_new/umac128_new/g \
+	    -e s/umac_update/umac128_update/g \
+	    -e s/umac_final/umac128_final/g \
+	    -e s/umac_delete/umac128_delete/g \
+	    < ${.CURDIR}/../umac.c > ${.TARGET}
+
+SRCS+=	addrmatch.c atomicio.c authfd.c authfile.c bitmap.c blocks.c bufaux.c \
+	bufbn.c bufec.c buffer.c canohost.c chacha.c channels.c \
+	cipher-chachapoly.c cipher.c compat.c crc32.c dh.c digest-openssl.c \
+	dispatch.c dns.c ed25519.c fatal.c fe25519.c ge25519.c hash.c hmac.c \
+	hostfile.c kex.c kexc25519.c kexc25519c.c kexc25519s.c kexdh.c \
+	kexdhc.c kexdhs.c kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c \
+	kexgexs.c key.c krl.c log.c mac.c match.c misc.c monitor_fdpass.c \
+	msg.c nchan.c opacket.c packet.c poly1305.c progressmeter.c readpass.c \
+	sc25519.c smult_curve25519_ref.c ssh-dss.c ssh-ecdsa.c ssh-ed25519.c \
+	ssh-pkcs11.c ssh-rsa.c sshbuf-getput-basic.c sshbuf-getput-crypto.c \
+	sshbuf-misc.c sshbuf.c ssherr.c sshkey.c ttymodes.c uidswap.c umac.c \
+	umac128.c utf8.c uuencode.c verify.c xmalloc.c
 
 PROG=	sshd
 BINOWN=	root
@@ -9,16 +36,6 @@ BINMODE=555
 BINDIR=	/usr/sbin
 MAN=	sshd.8 sshd_config.5
 
-SRCS=	sshd.c auth-rhosts.c auth-passwd.c \
-	sshpty.c sshlogin.c servconf.c serverloop.c \
-	auth.c auth2.c auth-options.c session.c \
-	auth2-chall.c groupaccess.c \
-	auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
-	auth2-none.c auth2-passwd.c auth2-pubkey.c \
-	monitor.c monitor_wrap.c \
-	sftp-server.c sftp-common.c \
-	sandbox-pledge.c
-
 .include <bsd.own.mk> # for KERBEROS and AFS
 
 KERBEROS5=no