3 files changed, 97 insertions, 93 deletions

diff --git a/regress/unittests/sshkey/test_file.c b/regress/unittests/sshkey/test_file.c
index c8a236937..906491f2b 100644
--- a/regress/unittests/sshkey/test_file.c
+++ b/regress/unittests/sshkey/test_file.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: test_file.c,v 1.4 2015/07/07 14:53:30 markus Exp $ */
+/*      $OpenBSD: test_file.c,v 1.5 2015/10/06 01:20:59 djm Exp $ */
 /*
  * Regress test for sshkey.h key management API
  *
@@ -54,8 +54,7 @@ sshkey_file_tests(void)
 #ifdef WITH_SSH1
         TEST_START("parse RSA1 from private");
         buf = load_file("rsa1_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "rsa1_1",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k1, NULL);
         a = load_bignum("rsa1_1.param.n");
@@ -66,7 +65,7 @@ sshkey_file_tests(void)
         TEST_START("parse RSA1 from private w/ passphrase");
         buf = load_file("rsa1_1_pw");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf,
-            (const char *)sshbuf_ptr(pw), "rsa1_1_pw", &k2, NULL), 0);
+            (const char *)sshbuf_ptr(pw), &k2, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k2, NULL);
         ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
@@ -104,8 +103,7 @@ sshkey_file_tests(void)
 
         TEST_START("parse RSA from private");
         buf = load_file("rsa_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "rsa_1",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k1, NULL);
         a = load_bignum("rsa_1.param.n");
@@ -122,7 +120,7 @@ sshkey_file_tests(void)
         TEST_START("parse RSA from private w/ passphrase");
         buf = load_file("rsa_1_pw");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf,
-            (const char *)sshbuf_ptr(pw), "rsa_1_pw", &k2, NULL), 0);
+            (const char *)sshbuf_ptr(pw), &k2, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k2, NULL);
         ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
@@ -131,8 +129,7 @@ sshkey_file_tests(void)
 
         TEST_START("parse RSA from new-format");
         buf = load_file("rsa_n");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf,
-            "", "rsa_n", &k2, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k2, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k2, NULL);
         ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
@@ -142,7 +139,7 @@ sshkey_file_tests(void)
         TEST_START("parse RSA from new-format w/ passphrase");
         buf = load_file("rsa_n_pw");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf,
-            (const char *)sshbuf_ptr(pw), "rsa_n_pw", &k2, NULL), 0);
+            (const char *)sshbuf_ptr(pw), &k2, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k2, NULL);
         ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
@@ -197,8 +194,7 @@ sshkey_file_tests(void)
 
         TEST_START("parse DSA from private");
         buf = load_file("dsa_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "dsa_1",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k1, NULL);
         a = load_bignum("dsa_1.param.g");
@@ -215,7 +211,7 @@ sshkey_file_tests(void)
         TEST_START("parse DSA from private w/ passphrase");
         buf = load_file("dsa_1_pw");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf,
-            (const char *)sshbuf_ptr(pw), "dsa_1_pw", &k2, NULL), 0);
+            (const char *)sshbuf_ptr(pw), &k2, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k2, NULL);
         ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
@@ -224,8 +220,7 @@ sshkey_file_tests(void)
 
         TEST_START("parse DSA from new-format");
         buf = load_file("dsa_n");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf,
-            "", "dsa_n", &k2, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k2, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k2, NULL);
         ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
@@ -235,7 +230,7 @@ sshkey_file_tests(void)
         TEST_START("parse DSA from new-format w/ passphrase");
         buf = load_file("dsa_n_pw");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf,
-            (const char *)sshbuf_ptr(pw), "dsa_n_pw", &k2, NULL), 0);
+            (const char *)sshbuf_ptr(pw), &k2, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k2, NULL);
         ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
@@ -291,8 +286,7 @@ sshkey_file_tests(void)
 #ifdef OPENSSL_HAS_ECC
         TEST_START("parse ECDSA from private");
         buf = load_file("ecdsa_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "ecdsa_1",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k1, NULL);
         buf = load_text_file("ecdsa_1.param.curve");
@@ -315,7 +309,7 @@ sshkey_file_tests(void)
         TEST_START("parse ECDSA from private w/ passphrase");
         buf = load_file("ecdsa_1_pw");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf,
-            (const char *)sshbuf_ptr(pw), "ecdsa_1_pw", &k2, NULL), 0);
+            (const char *)sshbuf_ptr(pw), &k2, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k2, NULL);
         ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
@@ -324,8 +318,7 @@ sshkey_file_tests(void)
 
         TEST_START("parse ECDSA from new-format");
         buf = load_file("ecdsa_n");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf,
-            "", "ecdsa_n", &k2, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k2, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k2, NULL);
         ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
@@ -335,7 +328,7 @@ sshkey_file_tests(void)
         TEST_START("parse ECDSA from new-format w/ passphrase");
         buf = load_file("ecdsa_n_pw");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf,
-            (const char *)sshbuf_ptr(pw), "ecdsa_n_pw", &k2, NULL), 0);
+            (const char *)sshbuf_ptr(pw), &k2, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k2, NULL);
         ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
@@ -391,8 +384,7 @@ sshkey_file_tests(void)
 
         TEST_START("parse Ed25519 from private");
         buf = load_file("ed25519_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "ed25519_1",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k1, NULL);
         ASSERT_INT_EQ(k1->type, KEY_ED25519);
@@ -402,7 +394,7 @@ sshkey_file_tests(void)
         TEST_START("parse Ed25519 from private w/ passphrase");
         buf = load_file("ed25519_1_pw");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf,
-            (const char *)sshbuf_ptr(pw), "ed25519_1_pw", &k2, NULL), 0);
+            (const char *)sshbuf_ptr(pw), &k2, NULL), 0);
         sshbuf_free(buf);
         ASSERT_PTR_NE(k2, NULL);
         ASSERT_INT_EQ(sshkey_equal(k1, k2), 1);
diff --git a/regress/unittests/sshkey/test_fuzz.c b/regress/unittests/sshkey/test_fuzz.c
index 1f08a2e43..1f414e0ac 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.4 2015/03/04 23:22:35 djm Exp $ */
+/*      $OpenBSD: test_fuzz.c,v 1.6 2015/12/07 02:20:46 djm Exp $ */
 /*
  * Fuzz tests for key parsing
  *
@@ -72,13 +72,13 @@ public_fuzz(struct sshkey *k)
 }
 
 static void
-sig_fuzz(struct sshkey *k)
+sig_fuzz(struct sshkey *k, const char *sig_alg)
 {
         struct fuzz *fuzz;
         u_char *sig, c[] = "some junk to be signed";
         size_t l;
 
-        ASSERT_INT_EQ(sshkey_sign(k, &sig, &l, c, sizeof(c), 0), 0);
+        ASSERT_INT_EQ(sshkey_sign(k, &sig, &l, c, sizeof(c), sig_alg, 0), 0);
         ASSERT_SIZE_T_GT(l, 0);
         fuzz = fuzz_begin(FUZZ_1_BIT_FLIP | /* too slow FUZZ_2_BIT_FLIP | */
             FUZZ_1_BYTE_FLIP | FUZZ_2_BYTE_FLIP |
@@ -110,8 +110,7 @@ sshkey_fuzz_tests(void)
         fuzz = fuzz_begin(FUZZ_1_BIT_FLIP | FUZZ_1_BYTE_FLIP |
             FUZZ_TRUNCATE_START | FUZZ_TRUNCATE_END,
             sshbuf_mutable_ptr(buf), sshbuf_len(buf));
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshkey_free(k1);
         sshbuf_free(buf);
         ASSERT_PTR_NE(fuzzed = sshbuf_new(), NULL);
@@ -119,8 +118,7 @@ sshkey_fuzz_tests(void)
         for(; !fuzz_done(fuzz); fuzz_next(fuzz)) {
                 r = sshbuf_put(fuzzed, fuzz_ptr(fuzz), fuzz_len(fuzz));
                 ASSERT_INT_EQ(r, 0);
-                if (sshkey_parse_private_fileblob(fuzzed, "", "key",
-                    &k1, NULL) == 0)
+                if (sshkey_parse_private_fileblob(fuzzed, "", &k1, NULL) == 0)
                         sshkey_free(k1);
                 sshbuf_reset(fuzzed);
         }
@@ -154,8 +152,7 @@ sshkey_fuzz_tests(void)
         buf = load_file("rsa_1");
         fuzz = fuzz_begin(FUZZ_BASE64, sshbuf_mutable_ptr(buf),
             sshbuf_len(buf));
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshkey_free(k1);
         sshbuf_free(buf);
         ASSERT_PTR_NE(fuzzed = sshbuf_new(), NULL);
@@ -163,8 +160,7 @@ sshkey_fuzz_tests(void)
         for(; !fuzz_done(fuzz); fuzz_next(fuzz)) {
                 r = sshbuf_put(fuzzed, fuzz_ptr(fuzz), fuzz_len(fuzz));
                 ASSERT_INT_EQ(r, 0);
-                if (sshkey_parse_private_fileblob(fuzzed, "", "key",
-                    &k1, NULL) == 0)
+                if (sshkey_parse_private_fileblob(fuzzed, "", &k1, NULL) == 0)
                         sshkey_free(k1);
                 sshbuf_reset(fuzzed);
         }
@@ -176,8 +172,7 @@ sshkey_fuzz_tests(void)
         buf = load_file("rsa_n");
         fuzz = fuzz_begin(FUZZ_BASE64, sshbuf_mutable_ptr(buf),
             sshbuf_len(buf));
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshkey_free(k1);
         sshbuf_free(buf);
         ASSERT_PTR_NE(fuzzed = sshbuf_new(), NULL);
@@ -185,8 +180,7 @@ sshkey_fuzz_tests(void)
         for(; !fuzz_done(fuzz); fuzz_next(fuzz)) {
                 r = sshbuf_put(fuzzed, fuzz_ptr(fuzz), fuzz_len(fuzz));
                 ASSERT_INT_EQ(r, 0);
-                if (sshkey_parse_private_fileblob(fuzzed, "", "key",
-                    &k1, NULL) == 0)
+                if (sshkey_parse_private_fileblob(fuzzed, "", &k1, NULL) == 0)
                         sshkey_free(k1);
                 sshbuf_reset(fuzzed);
         }
@@ -198,8 +192,7 @@ sshkey_fuzz_tests(void)
         buf = load_file("dsa_1");
         fuzz = fuzz_begin(FUZZ_BASE64, sshbuf_mutable_ptr(buf),
             sshbuf_len(buf));
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshkey_free(k1);
         sshbuf_free(buf);
         ASSERT_PTR_NE(fuzzed = sshbuf_new(), NULL);
@@ -207,8 +200,7 @@ sshkey_fuzz_tests(void)
         for(; !fuzz_done(fuzz); fuzz_next(fuzz)) {
                 r = sshbuf_put(fuzzed, fuzz_ptr(fuzz), fuzz_len(fuzz));
                 ASSERT_INT_EQ(r, 0);
-                if (sshkey_parse_private_fileblob(fuzzed, "", "key",
-                    &k1, NULL) == 0)
+                if (sshkey_parse_private_fileblob(fuzzed, "", &k1, NULL) == 0)
                         sshkey_free(k1);
                 sshbuf_reset(fuzzed);
         }
@@ -220,8 +212,7 @@ sshkey_fuzz_tests(void)
         buf = load_file("dsa_n");
         fuzz = fuzz_begin(FUZZ_BASE64, sshbuf_mutable_ptr(buf),
             sshbuf_len(buf));
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshkey_free(k1);
         sshbuf_free(buf);
         ASSERT_PTR_NE(fuzzed = sshbuf_new(), NULL);
@@ -229,8 +220,7 @@ sshkey_fuzz_tests(void)
         for(; !fuzz_done(fuzz); fuzz_next(fuzz)) {
                 r = sshbuf_put(fuzzed, fuzz_ptr(fuzz), fuzz_len(fuzz));
                 ASSERT_INT_EQ(r, 0);
-                if (sshkey_parse_private_fileblob(fuzzed, "", "key",
-                    &k1, NULL) == 0)
+                if (sshkey_parse_private_fileblob(fuzzed, "", &k1, NULL) == 0)
                         sshkey_free(k1);
                 sshbuf_reset(fuzzed);
         }
@@ -243,8 +233,7 @@ sshkey_fuzz_tests(void)
         buf = load_file("ecdsa_1");
         fuzz = fuzz_begin(FUZZ_BASE64, sshbuf_mutable_ptr(buf),
             sshbuf_len(buf));
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshkey_free(k1);
         sshbuf_free(buf);
         ASSERT_PTR_NE(fuzzed = sshbuf_new(), NULL);
@@ -252,8 +241,7 @@ sshkey_fuzz_tests(void)
         for(; !fuzz_done(fuzz); fuzz_next(fuzz)) {
                 r = sshbuf_put(fuzzed, fuzz_ptr(fuzz), fuzz_len(fuzz));
                 ASSERT_INT_EQ(r, 0);
-                if (sshkey_parse_private_fileblob(fuzzed, "", "key",
-                    &k1, NULL) == 0)
+                if (sshkey_parse_private_fileblob(fuzzed, "", &k1, NULL) == 0)
                         sshkey_free(k1);
                 sshbuf_reset(fuzzed);
         }
@@ -265,8 +253,7 @@ sshkey_fuzz_tests(void)
         buf = load_file("ecdsa_n");
         fuzz = fuzz_begin(FUZZ_BASE64, sshbuf_mutable_ptr(buf),
             sshbuf_len(buf));
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshkey_free(k1);
         sshbuf_free(buf);
         ASSERT_PTR_NE(fuzzed = sshbuf_new(), NULL);
@@ -274,8 +261,7 @@ sshkey_fuzz_tests(void)
         for(; !fuzz_done(fuzz); fuzz_next(fuzz)) {
                 r = sshbuf_put(fuzzed, fuzz_ptr(fuzz), fuzz_len(fuzz));
                 ASSERT_INT_EQ(r, 0);
-                if (sshkey_parse_private_fileblob(fuzzed, "", "key",
-                    &k1, NULL) == 0)
+                if (sshkey_parse_private_fileblob(fuzzed, "", &k1, NULL) == 0)
                         sshkey_free(k1);
                 sshbuf_reset(fuzzed);
         }
@@ -288,8 +274,7 @@ sshkey_fuzz_tests(void)
         buf = load_file("ed25519_1");
         fuzz = fuzz_begin(FUZZ_BASE64, sshbuf_mutable_ptr(buf),
             sshbuf_len(buf));
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshkey_free(k1);
         sshbuf_free(buf);
         ASSERT_PTR_NE(fuzzed = sshbuf_new(), NULL);
@@ -297,8 +282,7 @@ sshkey_fuzz_tests(void)
         for(; !fuzz_done(fuzz); fuzz_next(fuzz)) {
                 r = sshbuf_put(fuzzed, fuzz_ptr(fuzz), fuzz_len(fuzz));
                 ASSERT_INT_EQ(r, 0);
-                if (sshkey_parse_private_fileblob(fuzzed, "", "key",
-                    &k1, NULL) == 0)
+                if (sshkey_parse_private_fileblob(fuzzed, "", &k1, NULL) == 0)
                         sshkey_free(k1);
                 sshbuf_reset(fuzzed);
         }
@@ -308,8 +292,7 @@ sshkey_fuzz_tests(void)
 
         TEST_START("fuzz RSA public");
         buf = load_file("rsa_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
         public_fuzz(k1);
         sshkey_free(k1);
@@ -323,8 +306,7 @@ sshkey_fuzz_tests(void)
 
         TEST_START("fuzz DSA public");
         buf = load_file("dsa_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
         public_fuzz(k1);
         sshkey_free(k1);
@@ -339,8 +321,7 @@ sshkey_fuzz_tests(void)
 #ifdef OPENSSL_HAS_ECC
         TEST_START("fuzz ECDSA public");
         buf = load_file("ecdsa_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
         public_fuzz(k1);
         sshkey_free(k1);
@@ -355,8 +336,7 @@ sshkey_fuzz_tests(void)
 
         TEST_START("fuzz Ed25519 public");
         buf = load_file("ed25519_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
         public_fuzz(k1);
         sshkey_free(k1);
@@ -370,39 +350,51 @@ sshkey_fuzz_tests(void)
 
         TEST_START("fuzz RSA sig");
         buf = load_file("rsa_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
-        sig_fuzz(k1);
+        sig_fuzz(k1, "ssh-rsa");
+        sshkey_free(k1);
+        TEST_DONE();
+
+        TEST_START("fuzz RSA SHA256 sig");
+        buf = load_file("rsa_1");
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
+        sshbuf_free(buf);
+        sig_fuzz(k1, "rsa-sha2-256");
+        sshkey_free(k1);
+        TEST_DONE();
+
+        TEST_START("fuzz RSA SHA512 sig");
+        buf = load_file("rsa_1");
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
+        sshbuf_free(buf);
+        sig_fuzz(k1, "rsa-sha2-512");
         sshkey_free(k1);
         TEST_DONE();
 
         TEST_START("fuzz DSA sig");
         buf = load_file("dsa_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
-        sig_fuzz(k1);
+        sig_fuzz(k1, NULL);
         sshkey_free(k1);
         TEST_DONE();
 
 #ifdef OPENSSL_HAS_ECC
         TEST_START("fuzz ECDSA sig");
         buf = load_file("ecdsa_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
-        sig_fuzz(k1);
+        sig_fuzz(k1, NULL);
         sshkey_free(k1);
         TEST_DONE();
 #endif
 
         TEST_START("fuzz Ed25519 sig");
         buf = load_file("ed25519_1");
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", "key",
-            &k1, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
         sshbuf_free(buf);
-        sig_fuzz(k1);
+        sig_fuzz(k1, NULL);
         sshkey_free(k1);
         TEST_DONE();
 
diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c
index 9b3ce7ee4..1f160d1a7 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.7 2015/08/05 05:27:33 djm Exp $ */
+/*      $OpenBSD: test_sshkey.c,v 1.9 2015/12/07 02:20:46 djm Exp $ */
 /*
  * Regress test for sshkey.h key management API
  *
@@ -52,7 +52,8 @@ put_opt(struct sshbuf *b, const char *name, const char *value)
 
 static void
 build_cert(struct sshbuf *b, const struct sshkey *k, const char *type,
-    const struct sshkey *sign_key, const struct sshkey *ca_key)
+    const struct sshkey *sign_key, const struct sshkey *ca_key,
+    const char *sig_alg)
 {
         struct sshbuf *ca_buf, *pk, *principals, *critopts, *exts;
         u_char *sigblob;
@@ -99,7 +100,7 @@ build_cert(struct sshbuf *b, const 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), 0), 0);
+            sshbuf_ptr(b), sshbuf_len(b), sig_alg, 0), 0);
         ASSERT_INT_EQ(sshbuf_put_string(b, sigblob, siglen), 0); /* signature */
 
         free(sigblob);
@@ -111,12 +112,13 @@ build_cert(struct sshbuf *b, const struct sshkey *k, const char *type,
 }
 
 static void
-signature_test(struct sshkey *k, struct sshkey *bad, const u_char *d, size_t l)
+signature_test(struct sshkey *k, struct sshkey *bad, const char *sig_alg,
+    const u_char *d, size_t l)
 {
         size_t len;
         u_char *sig;
 
-        ASSERT_INT_EQ(sshkey_sign(k, &sig, &len, d, l, 0), 0);
+        ASSERT_INT_EQ(sshkey_sign(k, &sig, &len, d, l, sig_alg, 0), 0);
         ASSERT_SIZE_T_GT(len, 8);
         ASSERT_PTR_NE(sig, NULL);
         ASSERT_INT_EQ(sshkey_verify(k, sig, len, d, l, 0), 0);
@@ -143,7 +145,7 @@ banana(u_char *s, size_t l)
 }
 
 static void
-signature_tests(struct sshkey *k, struct sshkey *bad)
+signature_tests(struct sshkey *k, struct sshkey *bad, const char *sig_alg)
 {
         u_char i, buf[2049];
         size_t lens[] = {
@@ -155,7 +157,7 @@ signature_tests(struct sshkey *k, struct sshkey *bad)
                 test_subtest_info("%s key, banana length %zu",
                     sshkey_type(k), lens[i]);
                 banana(buf, lens[i]);
-                signature_test(k, bad, buf, lens[i]);
+                signature_test(k, bad, sig_alg, buf, lens[i]);
         }
 }
 
@@ -166,7 +168,7 @@ get_private(const char *n)
         struct sshkey *ret;
 
         b = load_file(n);
-        ASSERT_INT_EQ(sshkey_parse_private_fileblob(b, "", n, &ret, NULL), 0);
+        ASSERT_INT_EQ(sshkey_parse_private_fileblob(b, "", &ret, NULL), 0);
         sshbuf_free(b);
         return ret;
 }
@@ -469,7 +471,25 @@ sshkey_tests(void)
         k1 = get_private("rsa_1");
         ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_2.pub"), &k2,
             NULL), 0);
-        signature_tests(k1, k2);
+        signature_tests(k1, k2, "ssh-rsa");
+        sshkey_free(k1);
+        sshkey_free(k2);
+        TEST_DONE();
+
+        TEST_START("sign and verify RSA-SHA256");
+        k1 = get_private("rsa_1");
+        ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_2.pub"), &k2,
+            NULL), 0);
+        signature_tests(k1, k2, "rsa-sha2-256");
+        sshkey_free(k1);
+        sshkey_free(k2);
+        TEST_DONE();
+
+        TEST_START("sign and verify RSA-SHA512");
+        k1 = get_private("rsa_1");
+        ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_2.pub"), &k2,
+            NULL), 0);
+        signature_tests(k1, k2, "rsa-sha2-512");
         sshkey_free(k1);
         sshkey_free(k2);
         TEST_DONE();
@@ -478,7 +498,7 @@ sshkey_tests(void)
         k1 = get_private("dsa_1");
         ASSERT_INT_EQ(sshkey_load_public(test_data_file("dsa_2.pub"), &k2,
             NULL), 0);
-        signature_tests(k1, k2);
+        signature_tests(k1, k2, NULL);
         sshkey_free(k1);
         sshkey_free(k2);
         TEST_DONE();
@@ -488,7 +508,7 @@ sshkey_tests(void)
         k1 = get_private("ecdsa_1");
         ASSERT_INT_EQ(sshkey_load_public(test_data_file("ecdsa_2.pub"), &k2,
             NULL), 0);
-        signature_tests(k1, k2);
+        signature_tests(k1, k2, NULL);
         sshkey_free(k1);
         sshkey_free(k2);
         TEST_DONE();
@@ -498,7 +518,7 @@ sshkey_tests(void)
         k1 = get_private("ed25519_1");
         ASSERT_INT_EQ(sshkey_load_public(test_data_file("ed25519_2.pub"), &k2,
             NULL), 0);
-        signature_tests(k1, k2);
+        signature_tests(k1, k2, NULL);
         sshkey_free(k1);
         sshkey_free(k2);
         TEST_DONE();
@@ -508,7 +528,7 @@ sshkey_tests(void)
         ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_1.pub"), &k2,
             NULL), 0);
         k3 = get_private("rsa_1");
-        build_cert(b, k2, "ssh-rsa-cert-v01@openssh.com", k3, k1);
+        build_cert(b, k2, "ssh-rsa-cert-v01@openssh.com", k3, k1, NULL);
         ASSERT_INT_EQ(sshkey_from_blob(sshbuf_ptr(b), sshbuf_len(b), &k4),
             SSH_ERR_KEY_CERT_INVALID_SIGN_KEY);
         ASSERT_PTR_EQ(k4, NULL);