upstream: adapt to changes in KEX APIs and file removals

OpenBSD-Regress-ID: 54d6857e7c58999c7a6d40942ab0fed3529f43ca

1 files changed, 15 insertions, 6 deletions

diff --git a/regress/misc/kexfuzz/Makefile b/regress/misc/kexfuzz/Makefile
index a7bb6b70d..20802cb87 100644
--- a/regress/misc/kexfuzz/Makefile
+++ b/regress/misc/kexfuzz/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.3 2017/12/21 05:46:35 djm Exp $
+#       $OpenBSD: Makefile,v 1.4 2019/01/21 12:50:12 djm Exp $
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
@@ -18,12 +18,21 @@ SRCS+=atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c ssh-dss.c
 SRCS+=ssh-ecdsa.c ssh-ed25519.c mac.c umac.c umac128.c hmac.c misc.c
 SRCS+=ssherr.c uidswap.c cleanup.c xmalloc.c match.c krl.c fatal.c
 SRCS+=addrmatch.c bitmap.c packet.c dispatch.c canohost.c ssh_api.c
-SRCS+=kex.c kexc25519.c kexc25519c.c kexc25519s.c kexdh.c kexdhc.c kexdhs.c
-SRCS+=kexecdh.c kexecdhc.c kexecdhs.c kexgex.c kexgexc.c kexgexs.c
-SRCS+=dh.c compat.c
-SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c
+SRCS+=compat.c ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c
 SRCS+=cipher-chachapoly.c chacha.c poly1305.c
-SRCS+=smult_curve25519_ref.c
+
+SRCS+=  kex.c
+SRCS+=  dh.c
+SRCS+=  kexdh.c
+SRCS+=  kexecdh.c
+SRCS+=  kexgex.c
+SRCS+=  kexgexc.c
+SRCS+=  kexgexs.c
+SRCS+=  kexc25519.c
+SRCS+=  smult_curve25519_ref.c
+SRCS+=  kexgen.c
+SRCS+=  kexsntrup4591761x25519.c
+SRCS+=  sntrup4591761.c
 
 SRCS+=digest-openssl.c
 #SRCS+=digest-libc.c