New upstream release (7.9p1)

13 files changed, 183 insertions, 58 deletions

diff --git a/regress/unittests/sshkey/common.c b/regress/unittests/sshkey/common.c
index b598f05cb..e63465c47 100644
--- a/regress/unittests/sshkey/common.c
+++ b/regress/unittests/sshkey/common.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: common.c,v 1.2 2015/01/08 13:10:58 djm Exp $ */
+/*      $OpenBSD: common.c,v 1.3 2018/09/13 09:03:20 djm Exp $ */
 /*
  * Helpers for key API tests
  *
@@ -27,6 +27,8 @@
 # include <openssl/ec.h>
 #endif
 
+#include "openbsd-compat/openssl-compat.h"
+
 #include "../test_helper/test_helper.h"
 
 #include "ssherr.h"
@@ -82,3 +84,80 @@ load_bignum(const char *name)
         return ret;
 }
 
+const BIGNUM *
+rsa_n(struct sshkey *k)
+{
+        const BIGNUM *n = NULL;
+
+        ASSERT_PTR_NE(k, NULL);
+        ASSERT_PTR_NE(k->rsa, NULL);
+        RSA_get0_key(k->rsa, &n, NULL, NULL);
+        return n;
+}
+
+const BIGNUM *
+rsa_e(struct sshkey *k)
+{
+        const BIGNUM *e = NULL;
+
+        ASSERT_PTR_NE(k, NULL);
+        ASSERT_PTR_NE(k->rsa, NULL);
+        RSA_get0_key(k->rsa, NULL, &e, NULL);
+        return e;
+}
+
+const BIGNUM *
+rsa_p(struct sshkey *k)
+{
+        const BIGNUM *p = NULL;
+
+        ASSERT_PTR_NE(k, NULL);
+        ASSERT_PTR_NE(k->rsa, NULL);
+        RSA_get0_factors(k->rsa, &p, NULL);
+        return p;
+}
+
+const BIGNUM *
+rsa_q(struct sshkey *k)
+{
+        const BIGNUM *q = NULL;
+
+        ASSERT_PTR_NE(k, NULL);
+        ASSERT_PTR_NE(k->rsa, NULL);
+        RSA_get0_factors(k->rsa, NULL, &q);
+        return q;
+}
+
+const BIGNUM *
+dsa_g(struct sshkey *k)
+{
+        const BIGNUM *g = NULL;
+
+        ASSERT_PTR_NE(k, NULL);
+        ASSERT_PTR_NE(k->dsa, NULL);
+        DSA_get0_pqg(k->dsa, NULL, NULL, &g);
+        return g;
+}
+
+const BIGNUM *
+dsa_pub_key(struct sshkey *k)
+{
+        const BIGNUM *pub_key = NULL;
+
+        ASSERT_PTR_NE(k, NULL);
+        ASSERT_PTR_NE(k->dsa, NULL);
+        DSA_get0_key(k->dsa, &pub_key, NULL);
+        return pub_key;
+}
+
+const BIGNUM *
+dsa_priv_key(struct sshkey *k)
+{
+        const BIGNUM *priv_key = NULL;
+
+        ASSERT_PTR_NE(k, NULL);
+        ASSERT_PTR_NE(k->dsa, NULL);
+        DSA_get0_key(k->dsa, NULL, &priv_key);
+        return priv_key;
+}
+
diff --git a/regress/unittests/sshkey/common.h b/regress/unittests/sshkey/common.h
index bf7d19dce..7a514fdc8 100644
--- a/regress/unittests/sshkey/common.h
+++ b/regress/unittests/sshkey/common.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: common.h,v 1.1 2014/06/24 01:14:18 djm Exp $ */
+/*      $OpenBSD: common.h,v 1.2 2018/09/13 09:03:20 djm Exp $ */
 /*
  * Helpers for key API tests
  *
@@ -14,3 +14,12 @@ struct sshbuf *load_text_file(const char *name);
 /* Load a bignum from a file */
 BIGNUM *load_bignum(const char *name);
 
+/* Accessors for key components */
+const BIGNUM *rsa_n(struct sshkey *k);
+const BIGNUM *rsa_e(struct sshkey *k);
+const BIGNUM *rsa_p(struct sshkey *k);
+const BIGNUM *rsa_q(struct sshkey *k);
+const BIGNUM *dsa_g(struct sshkey *k);
+const BIGNUM *dsa_pub_key(struct sshkey *k);
+const BIGNUM *dsa_priv_key(struct sshkey *k);
+
diff --git a/regress/unittests/sshkey/mktestdata.sh b/regress/unittests/sshkey/mktestdata.sh
index 8047bc62f..93da34c64 100755
--- a/regress/unittests/sshkey/mktestdata.sh
+++ b/regress/unittests/sshkey/mktestdata.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: mktestdata.sh,v 1.6 2017/04/30 23:33:48 djm Exp $
+# $OpenBSD: mktestdata.sh,v 1.7 2018/09/12 01:36:45 djm Exp $
 
 PW=mekmitasdigoat
 
@@ -128,6 +128,18 @@ ssh-keygen -s rsa_2 -I hugo -n user1,user2 \
     -Oforce-command=/bin/ls -Ono-port-forwarding -Osource-address=10.0.0.0/8 \
     -V 19990101:20110101 -z 4 ed25519_1.pub
 
+# Make a few RSA variant signature too.
+cp rsa_1 rsa_1_sha1
+cp rsa_1 rsa_1_sha512
+cp rsa_1.pub rsa_1_sha1.pub
+cp rsa_1.pub rsa_1_sha512.pub
+ssh-keygen -s rsa_2 -I hugo -n user1,user2 -t ssh-rsa \
+    -Oforce-command=/bin/ls -Ono-port-forwarding -Osource-address=10.0.0.0/8 \
+    -V 19990101:20110101 -z 1 rsa_1_sha1.pub
+ssh-keygen -s rsa_2 -I hugo -n user1,user2 -t rsa-sha2-512 \
+    -Oforce-command=/bin/ls -Ono-port-forwarding -Osource-address=10.0.0.0/8 \
+    -V 19990101:20110101 -z 1 rsa_1_sha512.pub
+
 ssh-keygen -s ed25519_1 -I julius -n host1,host2 -h \
     -V 19990101:20110101 -z 5 rsa_1.pub
 ssh-keygen -s ed25519_1 -I julius -n host1,host2 -h \
diff --git a/regress/unittests/sshkey/test_file.c b/regress/unittests/sshkey/test_file.c
index 99b7e21c0..65610dacc 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.6 2017/04/30 23:33:48 djm Exp $ */
+/*      $OpenBSD: test_file.c,v 1.8 2018/09/13 09:03:20 djm Exp $ */
 /*
  * Regress test for sshkey.h key management API
  *
@@ -60,9 +60,9 @@ sshkey_file_tests(void)
         a = load_bignum("rsa_1.param.n");
         b = load_bignum("rsa_1.param.p");
         c = load_bignum("rsa_1.param.q");
-        ASSERT_BIGNUM_EQ(k1->rsa->n, a);
-        ASSERT_BIGNUM_EQ(k1->rsa->p, b);
-        ASSERT_BIGNUM_EQ(k1->rsa->q, c);
+        ASSERT_BIGNUM_EQ(rsa_n(k1), a);
+        ASSERT_BIGNUM_EQ(rsa_p(k1), b);
+        ASSERT_BIGNUM_EQ(rsa_q(k1), c);
         BN_free(a);
         BN_free(b);
         BN_free(c);
@@ -105,6 +105,24 @@ sshkey_file_tests(void)
         sshkey_free(k2);
         TEST_DONE();
 
+        TEST_START("load RSA cert with SHA1 signature");
+        ASSERT_INT_EQ(sshkey_load_cert(test_data_file("rsa_1_sha1"), &k2), 0);
+        ASSERT_PTR_NE(k2, NULL);
+        ASSERT_INT_EQ(k2->type, KEY_RSA_CERT);
+        ASSERT_INT_EQ(sshkey_equal_public(k1, k2), 1);
+        ASSERT_STRING_EQ(k2->cert->signature_type, "ssh-rsa");
+        sshkey_free(k2);
+        TEST_DONE();
+
+        TEST_START("load RSA cert with SHA512 signature");
+        ASSERT_INT_EQ(sshkey_load_cert(test_data_file("rsa_1_sha512"), &k2), 0);
+        ASSERT_PTR_NE(k2, NULL);
+        ASSERT_INT_EQ(k2->type, KEY_RSA_CERT);
+        ASSERT_INT_EQ(sshkey_equal_public(k1, k2), 1);
+        ASSERT_STRING_EQ(k2->cert->signature_type, "rsa-sha2-512");
+        sshkey_free(k2);
+        TEST_DONE();
+
         TEST_START("load RSA cert");
         ASSERT_INT_EQ(sshkey_load_cert(test_data_file("rsa_1"), &k2), 0);
         ASSERT_PTR_NE(k2, NULL);
@@ -151,9 +169,9 @@ sshkey_file_tests(void)
         a = load_bignum("dsa_1.param.g");
         b = load_bignum("dsa_1.param.priv");
         c = load_bignum("dsa_1.param.pub");
-        ASSERT_BIGNUM_EQ(k1->dsa->g, a);
-        ASSERT_BIGNUM_EQ(k1->dsa->priv_key, b);
-        ASSERT_BIGNUM_EQ(k1->dsa->pub_key, c);
+        ASSERT_BIGNUM_EQ(dsa_g(k1), a);
+        ASSERT_BIGNUM_EQ(dsa_priv_key(k1), b);
+        ASSERT_BIGNUM_EQ(dsa_pub_key(k1), c);
         BN_free(a);
         BN_free(b);
         BN_free(c);
diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c
index 72367bde7..47a03fad4 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.14 2018/07/13 02:13:19 djm Exp $ */
+/*      $OpenBSD: test_sshkey.c,v 1.17 2018/09/13 09:03:20 djm Exp $ */
 /*
  * Regress test for sshkey.h key management API
  *
@@ -197,9 +197,6 @@ sshkey_tests(void)
         k1 = sshkey_new(KEY_RSA);
         ASSERT_PTR_NE(k1, NULL);
         ASSERT_PTR_NE(k1->rsa, NULL);
-        ASSERT_PTR_NE(k1->rsa->n, NULL);
-        ASSERT_PTR_NE(k1->rsa->e, NULL);
-        ASSERT_PTR_EQ(k1->rsa->p, NULL);
         sshkey_free(k1);
         TEST_DONE();
 
@@ -207,8 +204,6 @@ sshkey_tests(void)
         k1 = sshkey_new(KEY_DSA);
         ASSERT_PTR_NE(k1, NULL);
         ASSERT_PTR_NE(k1->dsa, NULL);
-        ASSERT_PTR_NE(k1->dsa->g, NULL);
-        ASSERT_PTR_EQ(k1->dsa->priv_key, NULL);
         sshkey_free(k1);
         TEST_DONE();
 
@@ -230,27 +225,6 @@ sshkey_tests(void)
         sshkey_free(k1);
         TEST_DONE();
 
-        TEST_START("new_private KEY_RSA");
-        k1 = sshkey_new_private(KEY_RSA);
-        ASSERT_PTR_NE(k1, NULL);
-        ASSERT_PTR_NE(k1->rsa, NULL);
-        ASSERT_PTR_NE(k1->rsa->n, NULL);
-        ASSERT_PTR_NE(k1->rsa->e, NULL);
-        ASSERT_PTR_NE(k1->rsa->p, NULL);
-        ASSERT_INT_EQ(sshkey_add_private(k1), 0);
-        sshkey_free(k1);
-        TEST_DONE();
-
-        TEST_START("new_private KEY_DSA");
-        k1 = sshkey_new_private(KEY_DSA);
-        ASSERT_PTR_NE(k1, NULL);
-        ASSERT_PTR_NE(k1->dsa, NULL);
-        ASSERT_PTR_NE(k1->dsa->g, NULL);
-        ASSERT_PTR_NE(k1->dsa->priv_key, NULL);
-        ASSERT_INT_EQ(sshkey_add_private(k1), 0);
-        sshkey_free(k1);
-        TEST_DONE();
-
         TEST_START("generate KEY_RSA too small modulus");
         ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 128, &k1),
             SSH_ERR_KEY_LENGTH);
@@ -285,18 +259,18 @@ sshkey_tests(void)
         ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1024, &kr), 0);
         ASSERT_PTR_NE(kr, NULL);
         ASSERT_PTR_NE(kr->rsa, NULL);
-        ASSERT_PTR_NE(kr->rsa->n, NULL);
-        ASSERT_PTR_NE(kr->rsa->e, NULL);
-        ASSERT_PTR_NE(kr->rsa->p, NULL);
-        ASSERT_INT_EQ(BN_num_bits(kr->rsa->n), 1024);
+        ASSERT_PTR_NE(rsa_n(kr), NULL);
+        ASSERT_PTR_NE(rsa_e(kr), NULL);
+        ASSERT_PTR_NE(rsa_p(kr), NULL);
+        ASSERT_INT_EQ(BN_num_bits(rsa_n(kr)), 1024);
         TEST_DONE();
 
         TEST_START("generate KEY_DSA");
         ASSERT_INT_EQ(sshkey_generate(KEY_DSA, 1024, &kd), 0);
         ASSERT_PTR_NE(kd, NULL);
         ASSERT_PTR_NE(kd->dsa, NULL);
-        ASSERT_PTR_NE(kd->dsa->g, NULL);
-        ASSERT_PTR_NE(kd->dsa->priv_key, NULL);
+        ASSERT_PTR_NE(dsa_g(kd), NULL);
+        ASSERT_PTR_NE(dsa_priv_key(kd), NULL);
         TEST_DONE();
 
 #ifdef OPENSSL_HAS_ECC
@@ -318,14 +292,14 @@ sshkey_tests(void)
         TEST_DONE();
 
         TEST_START("demote KEY_RSA");
-        ASSERT_INT_EQ(sshkey_demote(kr, &k1), 0);
+        ASSERT_INT_EQ(sshkey_from_private(kr, &k1), 0);
         ASSERT_PTR_NE(k1, NULL);
         ASSERT_PTR_NE(kr, k1);
         ASSERT_INT_EQ(k1->type, KEY_RSA);
         ASSERT_PTR_NE(k1->rsa, NULL);
-        ASSERT_PTR_NE(k1->rsa->n, NULL);
-        ASSERT_PTR_NE(k1->rsa->e, NULL);
-        ASSERT_PTR_EQ(k1->rsa->p, NULL);
+        ASSERT_PTR_NE(rsa_n(k1), NULL);
+        ASSERT_PTR_NE(rsa_e(k1), NULL);
+        ASSERT_PTR_EQ(rsa_p(k1), NULL);
         TEST_DONE();
 
         TEST_START("equal KEY_RSA/demoted KEY_RSA");
@@ -334,13 +308,13 @@ sshkey_tests(void)
         TEST_DONE();
 
         TEST_START("demote KEY_DSA");
-        ASSERT_INT_EQ(sshkey_demote(kd, &k1), 0);
+        ASSERT_INT_EQ(sshkey_from_private(kd, &k1), 0);
         ASSERT_PTR_NE(k1, NULL);
         ASSERT_PTR_NE(kd, k1);
         ASSERT_INT_EQ(k1->type, KEY_DSA);
         ASSERT_PTR_NE(k1->dsa, NULL);
-        ASSERT_PTR_NE(k1->dsa->g, NULL);
-        ASSERT_PTR_EQ(k1->dsa->priv_key, NULL);
+        ASSERT_PTR_NE(dsa_g(k1), NULL);
+        ASSERT_PTR_EQ(dsa_priv_key(k1), NULL);
         TEST_DONE();
 
         TEST_START("equal KEY_DSA/demoted KEY_DSA");
@@ -350,7 +324,7 @@ sshkey_tests(void)
 
 #ifdef OPENSSL_HAS_ECC
         TEST_START("demote KEY_ECDSA");
-        ASSERT_INT_EQ(sshkey_demote(ke, &k1), 0);
+        ASSERT_INT_EQ(sshkey_from_private(ke, &k1), 0);
         ASSERT_PTR_NE(k1, NULL);
         ASSERT_PTR_NE(ke, k1);
         ASSERT_INT_EQ(k1->type, KEY_ECDSA);
@@ -367,7 +341,7 @@ sshkey_tests(void)
 #endif
 
         TEST_START("demote KEY_ED25519");
-        ASSERT_INT_EQ(sshkey_demote(kf, &k1), 0);
+        ASSERT_INT_EQ(sshkey_from_private(kf, &k1), 0);
         ASSERT_PTR_NE(k1, NULL);
         ASSERT_PTR_NE(kf, k1);
         ASSERT_INT_EQ(k1->type, KEY_ED25519);
diff --git a/regress/unittests/sshkey/testdata/rsa_1_sha1 b/regress/unittests/sshkey/testdata/rsa_1_sha1
new file mode 100644
index 000000000..5de3f8422
--- /dev/null
+++ b/regress/unittests/sshkey/testdata/rsa_1_sha1
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDLV5lUTt7FrADseB/CGhEZzpoojjEW5y8+ePvLppmK3MmMI18u
+d6vxzpK3bwZLYkVSyfJYI0HmIuGhdu7yMrW6wb84gbq8C31Xoe9EORcIUuGSvDKd
+NSM1SjlhDquRblDFB8kToqXyx1lqrXecXylxIUOL0jE+u0rU1967pDJx+wIDAQAB
+AoGAXyj5mpjmbD+YlxGIWz/zrM4hGsWgd4VteKEJxT6MMI4uzCRpkMd0ck8oHiwZ
+GAI/SwUzIsgtONQuH3AXVsUgghW4Ynn+8ksEv0IZ918WDMDwqvqkyrVzsOsZzqYj
+Pf8DUDKCpwFjnlknJ04yvWBZvVhWtY4OiZ8GV0Ttsu3k+GECQQD1YHfvBb5FdJBv
+Uhde2Il+jaFia8mwVVNNaiD2ECxXx6CzGz54ZLEB9NPVfDUZK8lJ4UJDqelWNh3i
+PF3RefWDAkEA1CVBzAFL4mNwpleVPzrfy69xP3gWOa26MxM/GE6zx9jC7HgQ3KPa
+WKdG/FuHs085aTRDaDLmGcZ8IvMuu7NgKQJAcIOKmxR0Gd8IN7NZugjqixggb0Pj
+mLKXXwESGiJyYtHL0zTj4Uqyi6Ya2GJ66o7UXscmnmYz828fJtTtZBdbRwJBALfi
+C2QvA32Zv/0PEXibKXy996WSC4G3ShwXZKtHHKHvCxY5BDSbehk59VesZrVPyG2e
+NYdOBxD0cIlCzJE56/ECQAndVkxvO8hwyEFGGwF3faHIAe/OxVb+MjaU25//Pe1/
+h/e6tlCk4w9CODpyV685gV394eYwMcGDcIkipTNUDZs=
+-----END RSA PRIVATE KEY-----
diff --git a/regress/unittests/sshkey/testdata/rsa_1_sha1-cert.pub b/regress/unittests/sshkey/testdata/rsa_1_sha1-cert.pub
new file mode 100644
index 000000000..ff49d7598
--- /dev/null
+++ b/regress/unittests/sshkey/testdata/rsa_1_sha1-cert.pub
@@ -0,0 +1 @@
+ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgy5PGFfSaEuSuXsjvKlMZGXYD0xlnqdZftuW9tMkUYz4AAAADAQABAAAAgQDLV5lUTt7FrADseB/CGhEZzpoojjEW5y8+ePvLppmK3MmMI18ud6vxzpK3bwZLYkVSyfJYI0HmIuGhdu7yMrW6wb84gbq8C31Xoe9EORcIUuGSvDKdNSM1SjlhDquRblDFB8kToqXyx1lqrXecXylxIUOL0jE+u0rU1967pDJx+wAAAAAAAAABAAAAAQAAAARodWdvAAAAEgAAAAV1c2VyMQAAAAV1c2VyMgAAAAA2i4NgAAAAAE0d4eAAAABEAAAADWZvcmNlLWNvbW1hbmQAAAALAAAABy9iaW4vbHMAAAAOc291cmNlLWFkZHJlc3MAAAAOAAAACjEwLjAuMC4wLzgAAABkAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAEXAAAAB3NzaC1yc2EAAAADAQABAAABAQD00RRenvxICSYvj54CPiYHM86OT5xwI9XORNH6Zkl3JPCQkAEdQ3hyfhraROaHsSv43wJcKyKrEg5XUZ8fZ/BoKIGU4Rd5AmL9wyPGv2RVY7gWELqXVSpu89R2tQJRmMVMD38CH0wqCTuoZirlKMTen6yfgYuFEpuqar0uOIeAyaQG6/9rVKWK36tcfM7YXx8fmGSN4eK/JhWDDjlo28YJ7ZFF9umh5baZG2Ai/vL3BJ7C3pqaEQNdKj8XqaSoDvFWKfOujk1620Rcuj3W0D0dvp/rH8xz8YkM1dMqGlYIZ4nrF5acB58Nk5FYBjtj1hu4DGEQlWL1Avk1agU4DQLrAAABDwAAAAdzc2gtcnNhAAABAF5BtPY8FbmIekK/zNq6/Lp5agKT5zEVxqAyZKhp75bLRP+kOMZBVB9ZWrekZk6IAVAOCZGQzTsD4mxIQsxBLl8k5hvEWb90/+w9/BzW9ScOGQe+y0COa0QWWR7L3k1S8WX2oAGvtDWOj7Md85nij4ZSU9/QQQFVDF8VilWPSMxUf/3I1fqyDq7AWcZkGk/bFUN6K6RsCSxIPlGmKt0IauyvSMI2IT0XeRT242RngeeUW8vFrn9TXy9YxJRW+cSeLKCuu8agBYyQMXWQ+q39eZZqVYSoo7nFEEhtaLs8d6jzgGkcE9wGJ9KLgfY/mG2vX3gI4IzncKkVJRoeiDzXFIk= RSA test key #1
diff --git a/regress/unittests/sshkey/testdata/rsa_1_sha1.pub b/regress/unittests/sshkey/testdata/rsa_1_sha1.pub
new file mode 100644
index 000000000..23ef872e0
--- /dev/null
+++ b/regress/unittests/sshkey/testdata/rsa_1_sha1.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDLV5lUTt7FrADseB/CGhEZzpoojjEW5y8+ePvLppmK3MmMI18ud6vxzpK3bwZLYkVSyfJYI0HmIuGhdu7yMrW6wb84gbq8C31Xoe9EORcIUuGSvDKdNSM1SjlhDquRblDFB8kToqXyx1lqrXecXylxIUOL0jE+u0rU1967pDJx+w== RSA test key #1
diff --git a/regress/unittests/sshkey/testdata/rsa_1_sha512 b/regress/unittests/sshkey/testdata/rsa_1_sha512
new file mode 100644
index 000000000..5de3f8422
--- /dev/null
+++ b/regress/unittests/sshkey/testdata/rsa_1_sha512
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDLV5lUTt7FrADseB/CGhEZzpoojjEW5y8+ePvLppmK3MmMI18u
+d6vxzpK3bwZLYkVSyfJYI0HmIuGhdu7yMrW6wb84gbq8C31Xoe9EORcIUuGSvDKd
+NSM1SjlhDquRblDFB8kToqXyx1lqrXecXylxIUOL0jE+u0rU1967pDJx+wIDAQAB
+AoGAXyj5mpjmbD+YlxGIWz/zrM4hGsWgd4VteKEJxT6MMI4uzCRpkMd0ck8oHiwZ
+GAI/SwUzIsgtONQuH3AXVsUgghW4Ynn+8ksEv0IZ918WDMDwqvqkyrVzsOsZzqYj
+Pf8DUDKCpwFjnlknJ04yvWBZvVhWtY4OiZ8GV0Ttsu3k+GECQQD1YHfvBb5FdJBv
+Uhde2Il+jaFia8mwVVNNaiD2ECxXx6CzGz54ZLEB9NPVfDUZK8lJ4UJDqelWNh3i
+PF3RefWDAkEA1CVBzAFL4mNwpleVPzrfy69xP3gWOa26MxM/GE6zx9jC7HgQ3KPa
+WKdG/FuHs085aTRDaDLmGcZ8IvMuu7NgKQJAcIOKmxR0Gd8IN7NZugjqixggb0Pj
+mLKXXwESGiJyYtHL0zTj4Uqyi6Ya2GJ66o7UXscmnmYz828fJtTtZBdbRwJBALfi
+C2QvA32Zv/0PEXibKXy996WSC4G3ShwXZKtHHKHvCxY5BDSbehk59VesZrVPyG2e
+NYdOBxD0cIlCzJE56/ECQAndVkxvO8hwyEFGGwF3faHIAe/OxVb+MjaU25//Pe1/
+h/e6tlCk4w9CODpyV685gV394eYwMcGDcIkipTNUDZs=
+-----END RSA PRIVATE KEY-----
diff --git a/regress/unittests/sshkey/testdata/rsa_1_sha512-cert.pub b/regress/unittests/sshkey/testdata/rsa_1_sha512-cert.pub
new file mode 100644
index 000000000..47451968f
--- /dev/null
+++ b/regress/unittests/sshkey/testdata/rsa_1_sha512-cert.pub
@@ -0,0 +1 @@
+ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAg/bUEmnMYHxlv1N7iXvnYPYdzDjlTRKoaIGEPkaQQQDwAAAADAQABAAAAgQDLV5lUTt7FrADseB/CGhEZzpoojjEW5y8+ePvLppmK3MmMI18ud6vxzpK3bwZLYkVSyfJYI0HmIuGhdu7yMrW6wb84gbq8C31Xoe9EORcIUuGSvDKdNSM1SjlhDquRblDFB8kToqXyx1lqrXecXylxIUOL0jE+u0rU1967pDJx+wAAAAAAAAABAAAAAQAAAARodWdvAAAAEgAAAAV1c2VyMQAAAAV1c2VyMgAAAAA2i4NgAAAAAE0d4eAAAABEAAAADWZvcmNlLWNvbW1hbmQAAAALAAAABy9iaW4vbHMAAAAOc291cmNlLWFkZHJlc3MAAAAOAAAACjEwLjAuMC4wLzgAAABkAAAAFXBlcm1pdC1YMTEtZm9yd2FyZGluZwAAAAAAAAAXcGVybWl0LWFnZW50LWZvcndhcmRpbmcAAAAAAAAACnBlcm1pdC1wdHkAAAAAAAAADnBlcm1pdC11c2VyLXJjAAAAAAAAAAAAAAEXAAAAB3NzaC1yc2EAAAADAQABAAABAQD00RRenvxICSYvj54CPiYHM86OT5xwI9XORNH6Zkl3JPCQkAEdQ3hyfhraROaHsSv43wJcKyKrEg5XUZ8fZ/BoKIGU4Rd5AmL9wyPGv2RVY7gWELqXVSpu89R2tQJRmMVMD38CH0wqCTuoZirlKMTen6yfgYuFEpuqar0uOIeAyaQG6/9rVKWK36tcfM7YXx8fmGSN4eK/JhWDDjlo28YJ7ZFF9umh5baZG2Ai/vL3BJ7C3pqaEQNdKj8XqaSoDvFWKfOujk1620Rcuj3W0D0dvp/rH8xz8YkM1dMqGlYIZ4nrF5acB58Nk5FYBjtj1hu4DGEQlWL1Avk1agU4DQLrAAABFAAAAAxyc2Etc2hhMi01MTIAAAEA7/GoZsJqrq4xYotsRbpM8arZDjCzT6kohXeD/GVy26s5E/YWXRYCrOMIzSZxjuN5rAaNRW8ffxq14JyI94566Kg2OeoxQ6rK/dTqkk7I1RyypSXunT3I4++RPs1Q+hu9eS/WBzur0/D3dMejhuc3IBg6iB0481I4pGBGcD8/KjQFfhlCuGVXwB1ALk2zfXFT1HYYrs6bYZuQqjgvArnjYJ0do3fTSDC20/ydV4BHnI3fVAY2THVjX45V2ppPadl/rpczaJqW1ZtpnpJkV8Un316stQSD0xLHUDjp89O6d9Yq5S0kDdfwTRJIPm9f2cGNakJwN5qzmmmdDroRKODYcg== RSA test key #1
diff --git a/regress/unittests/sshkey/testdata/rsa_1_sha512.pub b/regress/unittests/sshkey/testdata/rsa_1_sha512.pub
new file mode 100644
index 000000000..23ef872e0
--- /dev/null
+++ b/regress/unittests/sshkey/testdata/rsa_1_sha512.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDLV5lUTt7FrADseB/CGhEZzpoojjEW5y8+ePvLppmK3MmMI18ud6vxzpK3bwZLYkVSyfJYI0HmIuGhdu7yMrW6wb84gbq8C31Xoe9EORcIUuGSvDKdNSM1SjlhDquRblDFB8kToqXyx1lqrXecXylxIUOL0jE+u0rU1967pDJx+w== RSA test key #1
diff --git a/regress/unittests/test_helper/fuzz.c b/regress/unittests/test_helper/fuzz.c
index 99f1d036c..78b36654d 100644
--- a/regress/unittests/test_helper/fuzz.c
+++ b/regress/unittests/test_helper/fuzz.c
@@ -196,7 +196,6 @@ fuzz_dump(struct fuzz *fuzz)
         dump(fuzz_ptr(fuzz), fuzz_len(fuzz));
 }
 
-#ifdef SIGINFO
 static struct fuzz *last_fuzz;
 
 static void
@@ -211,7 +210,6 @@ siginfo(int unused __attribute__((__unused__)))
                 atomicio(vwrite, STDERR_FILENO, buf, strlen(buf));
         }
 }
-#endif
 
 struct fuzz *
 fuzz_begin(u_int strategies, const void *p, size_t l)
@@ -233,10 +231,11 @@ fuzz_begin(u_int strategies, const void *p, size_t l)
 
         fuzz_next(ret);
 
-#ifdef SIGINFO
         last_fuzz = ret;
+#ifdef SIGINFO
         signal(SIGINFO, siginfo);
 #endif
+        signal(SIGUSR1, siginfo);
 
         return ret;
 }
@@ -245,10 +244,11 @@ void
 fuzz_cleanup(struct fuzz *fuzz)
 {
         FUZZ_DBG(("cleanup, fuzz = %p", fuzz));
-#ifdef SIGINFO
         last_fuzz = NULL;
+#ifdef SIGINFO
         signal(SIGINFO, SIG_DFL);
 #endif
+        signal(SIGUSR1, SIG_DFL);
         assert(fuzz != NULL);
         assert(fuzz->seed != NULL);
         assert(fuzz->fuzzed != NULL);
diff --git a/regress/unittests/test_helper/test_helper.c b/regress/unittests/test_helper/test_helper.c
index 866f3495d..4cc70852c 100644
--- a/regress/unittests/test_helper/test_helper.c
+++ b/regress/unittests/test_helper/test_helper.c
@@ -203,7 +203,6 @@ test_info(char *s, size_t len)
             *subtest_info != '\0' ? " - " : "", subtest_info);
 }
 
-#ifdef SIGINFO
 static void
 siginfo(int unused __attribute__((__unused__)))
 {
@@ -212,7 +211,6 @@ siginfo(int unused __attribute__((__unused__)))
         test_info(buf, sizeof(buf));
         atomicio(vwrite, STDERR_FILENO, buf, strlen(buf));
 }
-#endif
 
 void
 test_start(const char *n)
@@ -226,6 +224,7 @@ test_start(const char *n)
 #ifdef SIGINFO
         signal(SIGINFO, siginfo);
 #endif
+        signal(SIGUSR1, siginfo);
 }
 
 void