11 files changed, 159 insertions, 34 deletions

diff --git a/regress/unittests/Makefile.inc b/regress/unittests/Makefile.inc
index 428ef6836..370224aa5 100644
--- a/regress/unittests/Makefile.inc
+++ b/regress/unittests/Makefile.inc
@@ -1,4 +1,4 @@
-#       $OpenBSD: Makefile.inc,v 1.13 2018/10/17 23:28:05 djm Exp $
+#       $OpenBSD: Makefile.inc,v 1.14 2019/11/25 10:32:35 djm Exp $
 
 REGRESS_FAIL_EARLY?=    yes
 
@@ -74,6 +74,9 @@ LDADD+= -lcrypto
 DPADD+= ${LIBCRYPTO}
 .endif
 
+LDADD+= -lfido2 -lcbor -lusbhid
+DPADD+= ${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID}
+
 UNITTEST_ARGS?=
 
 .if (${UNITTEST_VERBOSE:L} != "no")
diff --git a/regress/unittests/authopt/Makefile b/regress/unittests/authopt/Makefile
new file mode 100644
index 000000000..492092fc6
--- /dev/null
+++ b/regress/unittests/authopt/Makefile
@@ -0,0 +1,26 @@
+#       $OpenBSD: Makefile,v 1.4 2020/01/26 00:09:50 djm Exp $
+
+PROG=test_authopt
+SRCS=tests.c
+
+SRCS+=auth-options.c
+
+# From usr.bin/ssh
+SRCS+=sshbuf-getput-basic.c sshbuf-getput-crypto.c sshbuf-misc.c sshbuf.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
+SRCS+=cipher-chachapoly.c chacha.c poly1305.c ssh-ecdsa-sk.c ssh-sk.c
+SRCS+=ssh-ed25519-sk.c sk-usbhid.c
+
+SRCS+=digest-openssl.c
+#SRCS+=digest-libc.c
+
+REGRESS_TARGETS=run-regress-${PROG}
+
+run-regress-${PROG}: ${PROG}
+        env ${TEST_ENV} ./${PROG} -d ${.CURDIR}/testdata
+
+.include <bsd.regress.mk>
diff --git a/regress/unittests/hostkeys/Makefile b/regress/unittests/hostkeys/Makefile
index 336885122..c0a893135 100644
--- a/regress/unittests/hostkeys/Makefile
+++ b/regress/unittests/hostkeys/Makefile
@@ -1,16 +1,17 @@
-#       $OpenBSD: Makefile,v 1.4 2017/12/21 00:41:22 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
-SRCS+=cipher-chachapoly.c chacha.c poly1305.c
+SRCS+=cipher-chachapoly.c chacha.c poly1305.c ssh-ecdsa-sk.c ssh-sk.c
+SRCS+=ssh-ed25519-sk.c sk-usbhid.c
 
 SRCS+=digest-openssl.c
 #SRCS+=digest-libc.c
diff --git a/regress/unittests/kex/Makefile b/regress/unittests/kex/Makefile
index 7b4c644e5..648006c78 100644
--- a/regress/unittests/kex/Makefile
+++ b/regress/unittests/kex/Makefile
@@ -1,16 +1,17 @@
-#       $OpenBSD: Makefile,v 1.6 2019/01/21 12:35:20 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
-SRCS+=cipher-chachapoly.c chacha.c poly1305.c
+SRCS+=cipher-chachapoly.c chacha.c poly1305.c ssh-ecdsa-sk.c ssh-sk.c
+SRCS+=ssh-ed25519-sk.c sk-usbhid.c
 
 SRCS+=  kex.c
 SRCS+=  dh.c
diff --git a/regress/unittests/misc/Makefile b/regress/unittests/misc/Makefile
new file mode 100644
index 000000000..06e954cb8
--- /dev/null
+++ b/regress/unittests/misc/Makefile
@@ -0,0 +1,16 @@
+#       $OpenBSD: Makefile,v 1.1 2019/04/28 22:53:26 dtucker Exp $
+
+PROG=test_misc
+SRCS=tests.c
+
+# From usr.bin/ssh/Makefile.inc
+SRCS+=sshbuf.c sshbuf-getput-basic.c ssherr.c log.c xmalloc.c misc.c
+# From usr/bin/ssh/sshd/Makefile
+SRCS+=atomicio.c cleanup.c fatal.c
+
+REGRESS_TARGETS=run-regress-${PROG}
+
+run-regress-${PROG}: ${PROG}
+        env ${TEST_ENV} ./${PROG}
+
+.include <bsd.regress.mk>
diff --git a/regress/unittests/misc/tests.c b/regress/unittests/misc/tests.c
new file mode 100644
index 000000000..ed775ebbd
--- /dev/null
+++ b/regress/unittests/misc/tests.c
@@ -0,0 +1,79 @@
+/*      $OpenBSD: tests.c,v 1.1 2019/04/28 22:53:26 dtucker Exp $ */
+/*
+ * Regress test for misc helper functions.
+ *
+ * Placed in the public domain.
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "test_helper.h"
+
+#include "misc.h"
+
+void
+tests(void)
+{
+        int port;
+        char *user, *host, *path;
+
+        TEST_START("misc_parse_user_host_path");
+        ASSERT_INT_EQ(parse_user_host_path("someuser@some.host:some/path",
+            &user, &host, &path), 0);
+        ASSERT_STRING_EQ(user, "someuser");
+        ASSERT_STRING_EQ(host, "some.host");
+        ASSERT_STRING_EQ(path, "some/path");
+        free(user); free(host); free(path);
+        TEST_DONE();
+
+        TEST_START("misc_parse_user_ipv4_path");
+        ASSERT_INT_EQ(parse_user_host_path("someuser@1.22.33.144:some/path",
+            &user, &host, &path), 0);
+        ASSERT_STRING_EQ(user, "someuser");
+        ASSERT_STRING_EQ(host, "1.22.33.144");
+        ASSERT_STRING_EQ(path, "some/path");
+        free(user); free(host); free(path);
+        TEST_DONE();
+
+        TEST_START("misc_parse_user_[ipv4]_path");
+        ASSERT_INT_EQ(parse_user_host_path("someuser@[1.22.33.144]:some/path",
+            &user, &host, &path), 0);
+        ASSERT_STRING_EQ(user, "someuser");
+        ASSERT_STRING_EQ(host, "1.22.33.144");
+        ASSERT_STRING_EQ(path, "some/path");
+        free(user); free(host); free(path);
+        TEST_DONE();
+
+        TEST_START("misc_parse_user_[ipv4]_nopath");
+        ASSERT_INT_EQ(parse_user_host_path("someuser@[1.22.33.144]:",
+            &user, &host, &path), 0);
+        ASSERT_STRING_EQ(user, "someuser");
+        ASSERT_STRING_EQ(host, "1.22.33.144");
+        ASSERT_STRING_EQ(path, ".");
+        free(user); free(host); free(path);
+        TEST_DONE();
+
+        TEST_START("misc_parse_user_ipv6_path");
+        ASSERT_INT_EQ(parse_user_host_path("someuser@[::1]:some/path",
+            &user, &host, &path), 0);
+        ASSERT_STRING_EQ(user, "someuser");
+        ASSERT_STRING_EQ(host, "::1");
+        ASSERT_STRING_EQ(path, "some/path");
+        free(user); free(host); free(path);
+        TEST_DONE();
+
+        TEST_START("misc_parse_uri");
+        ASSERT_INT_EQ(parse_uri("ssh", "ssh://someuser@some.host:22/some/path",
+            &user, &host, &port, &path), 0);
+        ASSERT_STRING_EQ(user, "someuser");
+        ASSERT_STRING_EQ(host, "some.host");
+        ASSERT_INT_EQ(port, 22);
+        ASSERT_STRING_EQ(path, "some/path");
+        free(user); free(host); free(path);
+        TEST_DONE();
+}
diff --git a/regress/unittests/sshbuf/Makefile b/regress/unittests/sshbuf/Makefile
index 0e8e9fd10..5f6c4426a 100644
--- a/regress/unittests/sshbuf/Makefile
+++ b/regress/unittests/sshbuf/Makefile
@@ -1,6 +1,6 @@
-#       $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>
+#       $OpenBSD: Makefile,v 1.8 2020/01/26 00:09:50 djm Exp $
 
 PROG=test_sshbuf
 SRCS=tests.c
@@ -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 aa731df1c..78b2cf0ce 100644
--- a/regress/unittests/sshkey/Makefile
+++ b/regress/unittests/sshkey/Makefile
@@ -1,16 +1,17 @@
-#       $OpenBSD: Makefile,v 1.6 2018/10/17 23:28:05 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
-SRCS+=cipher-chachapoly.c chacha.c poly1305.c
+SRCS+=cipher-chachapoly.c chacha.c poly1305.c ssh-ecdsa-sk.c ssh-sk.c
+SRCS+=ssh-ed25519-sk.c sk-usbhid.c
 
 SRCS+=digest-openssl.c
 #SRCS+=digest-libc.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;
 }
 
diff --git a/regress/unittests/sshkey/test_fuzz.c b/regress/unittests/sshkey/test_fuzz.c
index 1323f8997..359811893 100644
--- a/regress/unittests/sshkey/test_fuzz.c
+++ b/regress/unittests/sshkey/test_fuzz.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: test_fuzz.c,v 1.9 2018/10/17 23:28:05 djm Exp $ */
+/*      $OpenBSD: test_fuzz.c,v 1.11 2019/11/25 10:32:35 djm Exp $ */
 /*
  * Fuzz tests for key parsing
  *
@@ -87,10 +87,11 @@ sig_fuzz(struct sshkey *k, const char *sig_alg)
         if (test_is_slow())
                 fuzzers |= FUZZ_2_BIT_FLIP;
 
-        ASSERT_INT_EQ(sshkey_sign(k, &sig, &l, c, sizeof(c), sig_alg, 0), 0);
+        ASSERT_INT_EQ(sshkey_sign(k, &sig, &l, c, sizeof(c),
+            sig_alg, NULL, 0), 0);
         ASSERT_SIZE_T_GT(l, 0);
         fuzz = fuzz_begin(fuzzers, sig, l);
-        ASSERT_INT_EQ(sshkey_verify(k, sig, l, c, sizeof(c), NULL, 0), 0);
+        ASSERT_INT_EQ(sshkey_verify(k, sig, l, c, sizeof(c), NULL, 0, NULL), 0);
         free(sig);
         TEST_ONERROR(onerror, fuzz);
         for(; !fuzz_done(fuzz); fuzz_next(fuzz)) {
@@ -98,7 +99,7 @@ sig_fuzz(struct sshkey *k, const char *sig_alg)
                 if (fuzz_matches_original(fuzz))
                         continue;
                 ASSERT_INT_NE(sshkey_verify(k, fuzz_ptr(fuzz), fuzz_len(fuzz),
-                    c, sizeof(c), NULL, 0), 0);
+                    c, sizeof(c), NULL, 0, NULL), 0);
         }
         fuzz_cleanup(fuzz);
 }
diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c
index 42395b8db..025bb9815 100644
--- a/regress/unittests/sshkey/test_sshkey.c
+++ b/regress/unittests/sshkey/test_sshkey.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: test_sshkey.c,v 1.18 2019/06/21 04:21:45 djm Exp $ */
+/*      $OpenBSD: test_sshkey.c,v 1.20 2019/11/25 10:32:35 djm Exp $ */
 /*
  * Regress test for sshkey.h key management API
  *
@@ -101,7 +101,7 @@ build_cert(struct sshbuf *b, struct sshkey *k, const char *type,
         ASSERT_INT_EQ(sshbuf_put_string(b, NULL, 0), 0); /* reserved */
         ASSERT_INT_EQ(sshbuf_put_stringb(b, ca_buf), 0); /* signature key */
         ASSERT_INT_EQ(sshkey_sign(sign_key, &sigblob, &siglen,
-            sshbuf_ptr(b), sshbuf_len(b), sig_alg, 0), 0);
+            sshbuf_ptr(b), sshbuf_len(b), sig_alg, NULL, 0), 0);
         ASSERT_INT_EQ(sshbuf_put_string(b, sigblob, siglen), 0); /* signature */
 
         free(sigblob);
@@ -120,14 +120,14 @@ signature_test(struct sshkey *k, struct sshkey *bad, const char *sig_alg,
         size_t len;
         u_char *sig;
 
-        ASSERT_INT_EQ(sshkey_sign(k, &sig, &len, d, l, sig_alg, 0), 0);
+        ASSERT_INT_EQ(sshkey_sign(k, &sig, &len, d, l, sig_alg, NULL, 0), 0);
         ASSERT_SIZE_T_GT(len, 8);
         ASSERT_PTR_NE(sig, NULL);
-        ASSERT_INT_EQ(sshkey_verify(k, sig, len, d, l, NULL, 0), 0);
-        ASSERT_INT_NE(sshkey_verify(bad, sig, len, d, l, NULL, 0), 0);
+        ASSERT_INT_EQ(sshkey_verify(k, sig, len, d, l, NULL, 0, NULL), 0);
+        ASSERT_INT_NE(sshkey_verify(bad, sig, len, d, l, NULL, 0, NULL), 0);
         /* Fuzz test is more comprehensive, this is just a smoke test */
         sig[len - 5] ^= 0x10;
-        ASSERT_INT_NE(sshkey_verify(k, sig, len, d, l, NULL, 0), 0);
+        ASSERT_INT_NE(sshkey_verify(k, sig, len, d, l, NULL, 0, NULL), 0);
         free(sig);
 }
 
@@ -437,7 +437,7 @@ sshkey_tests(void)
         put_opt(k1->cert->extensions, "permit-X11-forwarding", NULL);
         put_opt(k1->cert->extensions, "permit-agent-forwarding", NULL);
         ASSERT_INT_EQ(sshkey_from_private(k2, &k1->cert->signature_key), 0);
-        ASSERT_INT_EQ(sshkey_certify(k1, k2, NULL), 0);
+        ASSERT_INT_EQ(sshkey_certify(k1, k2, NULL, NULL), 0);
         b = sshbuf_new();
         ASSERT_PTR_NE(b, NULL);
         ASSERT_INT_EQ(sshkey_putb(k1, b), 0);