upstream: unbreak tests for recent security key changes

OpenBSD-Regress-ID: 2cdf2fcae9962ca4d711338f3ceec3c1391bdf95

diff --git a/regress/unittests/Makefile.inc b/regress/unittests/Makefile.inc
index 428ef683698190473eab65ee921e015130334ff2..370224aa5e366190b1c85ed0de2cc38d1b0e3129 100644 (file)
--- 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
index 03c34222cb06fbf2be0c086087f4a0c9aeee36ad..dfec2517404afdb2c3ffdef5bc4c9b521ca5867d 100644 (file)
--- a/regress/unittests/authopt/Makefile
+++ b/regress/unittests/authopt/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.2 2019/11/01 02:06:52 djm Exp $
+#      $OpenBSD: Makefile,v 1.3 2019/11/25 10:32:35 djm Exp $
 
 PROG=test_authopt
 SRCS=tests.c
@@ -13,6 +13,7 @@ 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

diff --git a/regress/unittests/hostkeys/Makefile b/regress/unittests/hostkeys/Makefile
index a8417bda5833ff66c01044d63a41272017b428b4..e3632c43d8c995c3886a57bba030f47561e6d3c4 100644 (file)
--- a/regress/unittests/hostkeys/Makefile
+++ b/regress/unittests/hostkeys/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.5 2019/11/01 02:04:25 djm Exp $
+#      $OpenBSD: Makefile,v 1.6 2019/11/25 10:32:35 djm Exp $
 
 PROG=test_hostkeys
 SRCS=tests.c test_iterate.c
@@ -11,6 +11,7 @@ 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 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 7b55b876b23e0c2860a0442a4ad545216e3316ce..c897a7ef59b5810b0ce4ce3ea8a99032b5046e04 100644 (file)
--- a/regress/unittests/kex/Makefile
+++ b/regress/unittests/kex/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.7 2019/11/01 02:03:27 djm Exp $
+#      $OpenBSD: Makefile,v 1.8 2019/11/25 10:32:35 djm Exp $
 
 PROG=test_kex
 SRCS=tests.c test_kex.c
@@ -11,6 +11,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 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/sshkey/Makefile b/regress/unittests/sshkey/Makefile
index 54da5081de2513772270425fe752a970050401d8..607a6d3fd6d6fa9137b866b3b2f190ad081600b8 100644 (file)
--- a/regress/unittests/sshkey/Makefile
+++ b/regress/unittests/sshkey/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.7 2019/11/01 01:57:59 djm Exp $
+#      $OpenBSD: Makefile,v 1.8 2019/11/25 10:32:35 djm Exp $
 
 PROG=test_sshkey
 SRCS=tests.c test_sshkey.c test_file.c test_fuzz.c common.c
@@ -11,6 +11,7 @@ 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

diff --git a/regress/unittests/sshkey/test_fuzz.c b/regress/unittests/sshkey/test_fuzz.c
index db907eb64bdb35879c6f33a3ee5a26c733345f3e..359811893170382a5bc1dd9f982e5e687cf1f2a6 100644 (file)
--- a/regress/unittests/sshkey/test_fuzz.c
+++ b/regress/unittests/sshkey/test_fuzz.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: test_fuzz.c,v 1.10 2019/11/01 01:57:59 djm Exp $ */
+/*     $OpenBSD: test_fuzz.c,v 1.11 2019/11/25 10:32:35 djm Exp $ */
 /*
  * Fuzz tests for key parsing
  *
@@ -91,7 +91,7 @@ sig_fuzz(struct sshkey *k, const char *sig_alg)
            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)) {
@@ -99,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 9e0ff12e55f767922e2b21aa3f80a718038ae24c..025bb98159caa336771d397e11b62529bb3f7da5 100644 (file)
--- a/regress/unittests/sshkey/test_sshkey.c
+++ b/regress/unittests/sshkey/test_sshkey.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: test_sshkey.c,v 1.19 2019/11/01 01:57:59 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
  *
@@ -123,11 +123,11 @@ signature_test(struct sshkey *k, struct sshkey *bad, const char *sig_alg,
        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);
 }