2 files changed, 15 insertions, 12 deletions

diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile
index d8b9afa9b39a8..fa586758b27cb 100644
--- a/secure/lib/libssh/Makefile
+++ b/secure/lib/libssh/Makefile
@@ -5,20 +5,24 @@
 LIB=	ssh
 PRIVATELIB=	true
 SHLIB_MAJOR=	5
-SRCS=	authfd.c authfile.c bufaux.c bufbn.c buffer.c \
-	canohost.c channels.c cipher.c cipher-aes.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
+SRCS+=	authfd.c authfile.c bufaux.c bufbn.c bufec.c buffer.c \
+	canohost.c channels.c cipher.c cipher-aes.c cipher-aesctr.c \
 	cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \
-	compat.c compress.c crc32.c deattack.c fatal.c hostfile.c \
-	log.c match.c md-sha256.c moduli.c nchan.c packet.c \
+	compat.c crc32.c deattack.c fatal.c hostfile.c \
+	log.c match.c md-sha256.c moduli.c nchan.c packet.c opacket.c \
 	readpass.c rsa.c ttymodes.c xmalloc.c addrmatch.c \
-	atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
+	atomicio.c key.c dispatch.c mac.c uidswap.c uuencode.c misc.c \
 	monitor_fdpass.c rijndael.c ssh-dss.c ssh-ecdsa.c ssh-rsa.c dh.c \
-	kexdh.c kexgex.c kexdhc.c kexgexc.c bufec.c kexecdh.c kexecdhc.c \
 	msg.c progressmeter.c dns.c entropy.c umac.c umac128.c \
-	ssh-pkcs11.c krl.c smult_curve25519_ref.c \
-	kexc25519.c kexc25519c.c poly1305.c chacha.c cipher-chachapoly.c \
-	ssh-ed25519.c digest-openssl.c hmac.c \
-	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c
+	ssh-pkcs11.c smult_curve25519_ref.c \
+	poly1305.c chacha.c cipher-chachapoly.c \
+	ssh-ed25519.c digest-openssl.c digest-libc.c hmac.c \
+	sc25519.c ge25519.c fe25519.c ed25519.c verify.c hash.c blocks.c \
+	kex.c kexdh.c kexgex.c kexecdh.c kexc25519.c \
+	kexdhc.c kexgexc.c kexecdhc.c kexc25519c.c \
+	kexdhs.c kexgexs.c kexecdhs.c kexc25519s.c
 PACKAGE=	ssh
 
 # gss-genr.c should be in $SRCS but causes linking problems, so it is
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile
index e647c1e8106dd..c9fd159ee6580 100644
--- a/secure/usr.sbin/sshd/Makefile
+++ b/secure/usr.sbin/sshd/Makefile
@@ -10,8 +10,7 @@ SRCS=	sshd.c auth-rhosts.c auth-passwd.c auth-rsa.c auth-rh-rsa.c \
 	auth-chall.c auth2-chall.c groupaccess.c \
 	auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \
 	auth2-none.c auth2-passwd.c auth2-pubkey.c \
-	monitor_mm.c monitor.c monitor_wrap.c kexdhs.c kexgexs.c kexecdhs.c \
-	kexc25519s.c auth-krb5.c \
+	monitor_mm.c monitor.c monitor_wrap.c auth-krb5.c \
 	auth2-gss.c gss-serv.c gss-serv-krb5.c \
 	loginrec.c auth-pam.c auth-shadow.c auth-sia.c md5crypt.c \
 	sftp-server.c sftp-common.c \