upstream: unbreak unittests for recent API / source file changes

OpenBSD-Regress-ID: 075a899a01bbf7781d38bf0b33d8366faaf6d3c0

2 files changed, 4 insertions, 8 deletions

diff --git a/regress/misc/kexfuzz/Makefile b/regress/misc/kexfuzz/Makefile
index 9cac412dc..9eb86931c 100644
--- a/regress/misc/kexfuzz/Makefile
+++ b/regress/misc/kexfuzz/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.6 2019/12/15 18:58:33 djm Exp $
+#       $OpenBSD: Makefile,v 1.7 2020/01/26 00:09:50 djm Exp $
 
 .include <bsd.own.mk>
 .include <bsd.obj.mk>
@@ -20,7 +20,7 @@ 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+=compat.c ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c
 SRCS+=cipher-chachapoly.c chacha.c poly1305.c
-SRCS+=ssh-ecdsa-sk.c ssh-ed25519-sk.c msg.c ssh-sk-client.c
+SRCS+=sshbuf-io.c ssh-ecdsa-sk.c ssh-ed25519-sk.c msg.c ssh-sk-client.c
 
 SRCS+=  kex.c
 SRCS+=  dh.c
diff --git a/regress/misc/kexfuzz/kexfuzz.c b/regress/misc/kexfuzz/kexfuzz.c
index 7051e87b1..56697c918 100644
--- a/regress/misc/kexfuzz/kexfuzz.c
+++ b/regress/misc/kexfuzz/kexfuzz.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: kexfuzz.c,v 1.5 2019/01/21 12:50:12 djm Exp $ */
+/*      $OpenBSD: kexfuzz.c,v 1.6 2020/01/26 00:09:50 djm Exp $ */
 /*
  * Fuzz harness for KEX code
  *
@@ -424,12 +424,8 @@ main(int argc, char **argv)
                 if (packet_index == -1 || direction == -1 || data_path == NULL)
                         badusage("Replace (-r) mode must specify direction "
                             "(-D) packet index (-i) and data path (-f)");
-                if ((fd = open(data_path, O_RDONLY)) == -1)
-                        err(1, "open %s", data_path);
-                replace_data = sshbuf_new();
-                if ((r = sshkey_load_file(fd, replace_data)) != 0)
+                if ((r = sshbuf_load_file(data_path, &replace_data)) != 0)
                         errx(1, "read %s: %s", data_path, ssh_err(r));
-                close(fd);
         }
 
         /* Dump mode */