upstream: unbreak unittests for recent API / source file changes

OpenBSD-Regress-ID: 075a899a01bbf7781d38bf0b33d8366faaf6d3c0

8 files changed, 22 insertions, 29 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 */
diff --git a/regress/unittests/authopt/Makefile b/regress/unittests/authopt/Makefile
index dfec25174..492092fc6 100644
--- a/regress/unittests/authopt/Makefile
+++ b/regress/unittests/authopt/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.3 2019/11/25 10:32:35 djm Exp $
+#       $OpenBSD: Makefile,v 1.4 2020/01/26 00:09:50 djm Exp $
 
 PROG=test_authopt
 SRCS=tests.c
@@ -7,8 +7,8 @@ SRCS+=auth-options.c
 
 # From usr.bin/ssh
 SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
-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+=sshbuf-io.c atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c
+SRCS+=ssh-dss.c 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
 SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c
diff --git a/regress/unittests/hostkeys/Makefile b/regress/unittests/hostkeys/Makefile
index e3632c43d..c0a893135 100644
--- a/regress/unittests/hostkeys/Makefile
+++ b/regress/unittests/hostkeys/Makefile
@@ -1,12 +1,12 @@
-#       $OpenBSD: Makefile,v 1.6 2019/11/25 10:32:35 djm Exp $
+#       $OpenBSD: Makefile,v 1.7 2020/01/26 00:09:50 djm Exp $
 
 PROG=test_hostkeys
 SRCS=tests.c test_iterate.c
 
 # From usr.bin/ssh
 SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
-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+=sshbuf-io.c atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c
+SRCS+=ssh-dss.c 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 hostfile.c
 SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c
diff --git a/regress/unittests/kex/Makefile b/regress/unittests/kex/Makefile
index c897a7ef5..648006c78 100644
--- a/regress/unittests/kex/Makefile
+++ b/regress/unittests/kex/Makefile
@@ -1,12 +1,12 @@
-#       $OpenBSD: Makefile,v 1.8 2019/11/25 10:32:35 djm Exp $
+#       $OpenBSD: Makefile,v 1.9 2020/01/26 00:09:50 djm Exp $
 
 PROG=test_kex
 SRCS=tests.c test_kex.c
 
 # From usr.bin/ssh
 SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
-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+=sshbuf-io.c atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c
+SRCS+=ssh-dss.c 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+=compat.c ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c
diff --git a/regress/unittests/sshbuf/Makefile b/regress/unittests/sshbuf/Makefile
index 0e8e9fd10..388cb5a78 100644
--- a/regress/unittests/sshbuf/Makefile
+++ b/regress/unittests/sshbuf/Makefile
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile,v 1.7 2018/10/17 23:28:05 djm Exp $
+#       $OpenBSD: Makefile,v 1.8 2020/01/26 00:09:50 djm Exp $
 
 .include <bsd.regress.mk>
 
@@ -14,7 +14,7 @@ SRCS+=test_sshbuf_fixed.c
 
 # From usr.bin/ssh
 SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
-SRCS+=atomicio.c
+SRCS+=sshbuf-io.c atomicio.c misc.c xmalloc.c log.c fatal.c ssherr.c cleanup.c
 
 run-regress-${PROG}: ${PROG}
         env ${TEST_ENV} ./${PROG} ${UNITTEST_ARGS}
diff --git a/regress/unittests/sshkey/Makefile b/regress/unittests/sshkey/Makefile
index 607a6d3fd..78b2cf0ce 100644
--- a/regress/unittests/sshkey/Makefile
+++ b/regress/unittests/sshkey/Makefile
@@ -1,12 +1,12 @@
-#       $OpenBSD: Makefile,v 1.8 2019/11/25 10:32:35 djm Exp $
+#       $OpenBSD: Makefile,v 1.9 2020/01/26 00:09:50 djm Exp $
 
 PROG=test_sshkey
 SRCS=tests.c test_sshkey.c test_file.c test_fuzz.c common.c
 
 # From usr.bin/ssh
 SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.c
-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+=sshbuf-io.c atomicio.c sshkey.c authfile.c cipher.c log.c ssh-rsa.c
+SRCS+=ssh-dss.c 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
 SRCS+=ed25519.c hash.c ge25519.c fe25519.c sc25519.c verify.c
diff --git a/regress/unittests/sshkey/common.c b/regress/unittests/sshkey/common.c
index e21638093..effea578c 100644
--- a/regress/unittests/sshkey/common.c
+++ b/regress/unittests/sshkey/common.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: common.c,v 1.3 2018/09/13 09:03:20 djm Exp $ */
+/*      $OpenBSD: common.c,v 1.4 2020/01/26 00:09:50 djm Exp $ */
 /*
  * Helpers for key API tests
  *
@@ -43,13 +43,10 @@
 struct sshbuf *
 load_file(const char *name)
 {
-        int fd;
-        struct sshbuf *ret;
+        struct sshbuf *ret = NULL;
 
-        ASSERT_PTR_NE(ret = sshbuf_new(), NULL);
-        ASSERT_INT_NE(fd = open(test_data_file(name), O_RDONLY), -1);
-        ASSERT_INT_EQ(sshkey_load_file(fd, ret), 0);
-        close(fd);
+        ASSERT_INT_EQ(sshbuf_load_file(test_data_file(name), &ret), 0);
+        ASSERT_PTR_NE(ret, NULL);
         return ret;
 }