upstream: adapt to extra sshkey_sign() argument and additional

dependencies

OpenBSD-Regress-ID: 7a25604968486c4d6f81d06e8fbc7d17519de50e

diff --git a/regress/unittests/sshkey/Makefile b/regress/unittests/sshkey/Makefile
index aa731df1c2d47506780756bc8b3de083ab1e1145..54da5081de2513772270425fe752a970050401d8 100644 (file)
--- a/regress/unittests/sshkey/Makefile
+++ b/regress/unittests/sshkey/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.6 2018/10/17 23:28:05 djm Exp $
+#      $OpenBSD: Makefile,v 1.7 2019/11/01 01:57:59 djm Exp $
 
 PROG=test_sshkey
 SRCS=tests.c test_sshkey.c test_file.c test_fuzz.c common.c
@@ -10,7 +10,7 @@ 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
 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+=digest-openssl.c
 #SRCS+=digest-libc.c

diff --git a/regress/unittests/sshkey/test_fuzz.c b/regress/unittests/sshkey/test_fuzz.c
index 1323f89974a77d553465b1299cad388e539213e3..db907eb64bdb35879c6f33a3ee5a26c733345f3e 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.9 2018/10/17 23:28:05 djm Exp $ */
+/*     $OpenBSD: test_fuzz.c,v 1.10 2019/11/01 01:57:59 djm Exp $ */
 /*
  * Fuzz tests for key parsing
  *
@@ -87,7 +87,8 @@ 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);

diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c
index 42395b8db6a3166427c4edfde0e446f7d8c58bf1..9e0ff12e55f767922e2b21aa3f80a718038ae24c 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.18 2019/06/21 04:21:45 djm Exp $ */
+/*     $OpenBSD: test_sshkey.c,v 1.19 2019/11/01 01:57:59 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,7 +120,7 @@ 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);
@@ -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);