5 files changed, 55 insertions, 21 deletions

diff --git a/regress/unittests/sshkey/common.c b/regress/unittests/sshkey/common.c
index e63465c47..e21638093 100644
--- a/regress/unittests/sshkey/common.c
+++ b/regress/unittests/sshkey/common.c
@@ -19,13 +19,15 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifdef WITH_OPENSSL
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 #include <openssl/objects.h>
 #ifdef OPENSSL_HAS_NISTP256
 # include <openssl/ec.h>
-#endif
+#endif /* OPENSSL_HAS_NISTP256 */
+#endif /* WITH_OPENSSL */
 
 #include "openbsd-compat/openssl-compat.h"
 
@@ -72,6 +74,7 @@ load_text_file(const char *name)
         return ret;
 }
 
+#ifdef WITH_OPENSSL
 BIGNUM *
 load_bignum(const char *name)
 {
@@ -160,4 +163,5 @@ dsa_priv_key(struct sshkey *k)
         DSA_get0_key(k->dsa, NULL, &priv_key);
         return priv_key;
 }
+#endif /* WITH_OPENSSL */
 
diff --git a/regress/unittests/sshkey/test_file.c b/regress/unittests/sshkey/test_file.c
index 65610dacc..55627bc12 100644
--- a/regress/unittests/sshkey/test_file.c
+++ b/regress/unittests/sshkey/test_file.c
@@ -19,13 +19,15 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifdef WITH_OPENSSL
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 #include <openssl/objects.h>
 #ifdef OPENSSL_HAS_NISTP256
 # include <openssl/ec.h>
-#endif
+#endif /* OPENSSL_HAS_NISTP256 */
+#endif /* WITH_OPENSSL */
 
 #include "../test_helper/test_helper.h"
 
@@ -44,7 +46,9 @@ sshkey_file_tests(void)
 {
         struct sshkey *k1, *k2;
         struct sshbuf *buf, *pw;
+#ifdef WITH_OPENSSL
         BIGNUM *a, *b, *c;
+#endif
         char *cp;
 
         TEST_START("load passphrase");
@@ -52,6 +56,7 @@ sshkey_file_tests(void)
         TEST_DONE();
 
 
+#ifdef WITH_OPENSSL
         TEST_START("parse RSA from private");
         buf = load_file("rsa_1");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
@@ -350,6 +355,7 @@ sshkey_file_tests(void)
 
         sshkey_free(k1);
 #endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("parse Ed25519 from private");
         buf = load_file("ed25519_1");
diff --git a/regress/unittests/sshkey/test_fuzz.c b/regress/unittests/sshkey/test_fuzz.c
index 5953de595..1323f8997 100644
--- a/regress/unittests/sshkey/test_fuzz.c
+++ b/regress/unittests/sshkey/test_fuzz.c
@@ -113,7 +113,7 @@ sshkey_fuzz_tests(void)
         struct fuzz *fuzz;
         int r, i;
 
-
+#ifdef WITH_OPENSSL
         TEST_START("fuzz RSA private");
         buf = load_file("rsa_1");
         fuzz = fuzz_begin(FUZZ_BASE64, sshbuf_mutable_ptr(buf),
@@ -246,7 +246,8 @@ sshkey_fuzz_tests(void)
         sshbuf_free(fuzzed);
         fuzz_cleanup(fuzz);
         TEST_DONE();
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("fuzz Ed25519 private");
         buf = load_file("ed25519_1");
@@ -270,6 +271,7 @@ sshkey_fuzz_tests(void)
         fuzz_cleanup(fuzz);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("fuzz RSA public");
         buf = load_file("rsa_1");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
@@ -312,7 +314,8 @@ sshkey_fuzz_tests(void)
         public_fuzz(k1);
         sshkey_free(k1);
         TEST_DONE();
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("fuzz Ed25519 public");
         buf = load_file("ed25519_1");
@@ -328,6 +331,7 @@ sshkey_fuzz_tests(void)
         sshkey_free(k1);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("fuzz RSA sig");
         buf = load_file("rsa_1");
         ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
@@ -368,7 +372,8 @@ sshkey_fuzz_tests(void)
         sig_fuzz(k1, NULL);
         sshkey_free(k1);
         TEST_DONE();
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("fuzz Ed25519 sig");
         buf = load_file("ed25519_1");
@@ -379,5 +384,6 @@ sshkey_fuzz_tests(void)
         TEST_DONE();
 
 /* XXX fuzz decoded new-format blobs too */
+/* XXX fuzz XMSS too */
 
 }
diff --git a/regress/unittests/sshkey/test_sshkey.c b/regress/unittests/sshkey/test_sshkey.c
index d003483f5..42395b8db 100644
--- a/regress/unittests/sshkey/test_sshkey.c
+++ b/regress/unittests/sshkey/test_sshkey.c
@@ -50,6 +50,7 @@ put_opt(struct sshbuf *b, const char *name, const char *value)
         sshbuf_free(sect);
 }
 
+#ifdef WITH_OPENSSL
 static void
 build_cert(struct sshbuf *b, struct sshkey *k, const char *type,
     struct sshkey *sign_key, struct sshkey *ca_key,
@@ -110,6 +111,7 @@ build_cert(struct sshbuf *b, struct sshkey *k, const char *type,
         sshbuf_free(principals);
         sshbuf_free(pk);
 }
+#endif /* WITH_OPENSSL */
 
 static void
 signature_test(struct sshkey *k, struct sshkey *bad, const char *sig_alg,
@@ -176,10 +178,13 @@ get_private(const char *n)
 void
 sshkey_tests(void)
 {
-        struct sshkey *k1, *k2, *k3, *k4, *kr, *kd, *kf;
+        struct sshkey *k1, *k2, *k3, *kf;
+#ifdef WITH_OPENSSL
+        struct sshkey *k4, *kr, *kd;
 #ifdef OPENSSL_HAS_ECC
         struct sshkey *ke;
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
         struct sshbuf *b;
 
         TEST_START("new invalid");
@@ -193,6 +198,7 @@ sshkey_tests(void)
         sshkey_free(k1);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("new/free KEY_RSA");
         k1 = sshkey_new(KEY_RSA);
         ASSERT_PTR_NE(k1, NULL);
@@ -281,7 +287,8 @@ sshkey_tests(void)
         ASSERT_PTR_NE(EC_KEY_get0_public_key(ke->ecdsa), NULL);
         ASSERT_PTR_NE(EC_KEY_get0_private_key(ke->ecdsa), NULL);
         TEST_DONE();
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("generate KEY_ED25519");
         ASSERT_INT_EQ(sshkey_generate(KEY_ED25519, 256, &kf), 0);
@@ -291,6 +298,7 @@ sshkey_tests(void)
         ASSERT_PTR_NE(kf->ed25519_sk, NULL);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("demote KEY_RSA");
         ASSERT_INT_EQ(sshkey_from_private(kr, &k1), 0);
         ASSERT_PTR_NE(k1, NULL);
@@ -338,7 +346,8 @@ sshkey_tests(void)
         ASSERT_INT_EQ(sshkey_equal(ke, k1), 1);
         sshkey_free(k1);
         TEST_DONE();
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("demote KEY_ED25519");
         ASSERT_INT_EQ(sshkey_from_private(kf, &k1), 0);
@@ -354,17 +363,20 @@ sshkey_tests(void)
         sshkey_free(k1);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("equal mismatched key types");
         ASSERT_INT_EQ(sshkey_equal(kd, kr), 0);
 #ifdef OPENSSL_HAS_ECC
         ASSERT_INT_EQ(sshkey_equal(kd, ke), 0);
         ASSERT_INT_EQ(sshkey_equal(kr, ke), 0);
         ASSERT_INT_EQ(sshkey_equal(ke, kf), 0);
-#endif
+#endif /* OPENSSL_HAS_ECC */
         ASSERT_INT_EQ(sshkey_equal(kd, kf), 0);
         TEST_DONE();
+#endif /* WITH_OPENSSL */
 
         TEST_START("equal different keys");
+#ifdef WITH_OPENSSL
         ASSERT_INT_EQ(sshkey_generate(KEY_RSA, 1024, &k1), 0);
         ASSERT_INT_EQ(sshkey_equal(kr, k1), 0);
         sshkey_free(k1);
@@ -375,17 +387,20 @@ sshkey_tests(void)
         ASSERT_INT_EQ(sshkey_generate(KEY_ECDSA, 256, &k1), 0);
         ASSERT_INT_EQ(sshkey_equal(ke, k1), 0);
         sshkey_free(k1);
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
         ASSERT_INT_EQ(sshkey_generate(KEY_ED25519, 256, &k1), 0);
         ASSERT_INT_EQ(sshkey_equal(kf, k1), 0);
         sshkey_free(k1);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         sshkey_free(kr);
         sshkey_free(kd);
 #ifdef OPENSSL_HAS_ECC
         sshkey_free(ke);
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
         sshkey_free(kf);
 
         TEST_START("certify key");
@@ -434,6 +449,7 @@ sshkey_tests(void)
         sshbuf_reset(b);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("sign and verify RSA");
         k1 = get_private("rsa_1");
         ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_2.pub"), &k2,
@@ -479,7 +495,8 @@ sshkey_tests(void)
         sshkey_free(k1);
         sshkey_free(k2);
         TEST_DONE();
-#endif
+#endif /* OPENSSL_HAS_ECC */
+#endif /* WITH_OPENSSL */
 
         TEST_START("sign and verify ED25519");
         k1 = get_private("ed25519_1");
@@ -490,6 +507,7 @@ sshkey_tests(void)
         sshkey_free(k2);
         TEST_DONE();
 
+#ifdef WITH_OPENSSL
         TEST_START("nested certificate");
         ASSERT_INT_EQ(sshkey_load_cert(test_data_file("rsa_1"), &k1), 0);
         ASSERT_INT_EQ(sshkey_load_public(test_data_file("rsa_1.pub"), &k2,
@@ -504,5 +522,5 @@ sshkey_tests(void)
         sshkey_free(k3);
         sshbuf_free(b);
         TEST_DONE();
-
+#endif /* WITH_OPENSSL */
 }
diff --git a/regress/unittests/sshkey/testdata/ed25519_1_pw b/regress/unittests/sshkey/testdata/ed25519_1_pw
index c3b7ae7f8..da94d2b8e 100644
--- a/regress/unittests/sshkey/testdata/ed25519_1_pw
+++ b/regress/unittests/sshkey/testdata/ed25519_1_pw
@@ -1,8 +1,8 @@
 -----BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jYmMAAAAGYmNyeXB0AAAAGAAAABCus+kaow
-AUjHphacvRp98dAAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIFOG6kY7Rf4UtCFv
-PwKgo/BztXck2xC4a2WyA34XtIwZAAAAoJaqqgiYQuElraJAmYOm7Tb4nJ3eI4oj9mQ52M
-/Yd+ION2Ur1v8BDewpDX+LHEYgKHo3Mlmcn2UyF+QJ+7xUCW7QCtk/4szrJzw74DlEl6mH
-T8PT/f/av7PpECBD/YD3NoDlB9OWm/Q4sHcxfBEKfTGD7s2Onn71HgrdEOPqd4Sj/IQigR
-drfjtXEMlD32k9n3dd2eS9x7AHWYaGFEMkOcY=
+b3BlbnNzaC1rZXktdjEAAAAACmFlczI1Ni1jdHIAAAAGYmNyeXB0AAAAGAAAABDKT56mBA
+tXIMsWqmuuA2gdAAAAEAAAAAEAAAAzAAAAC3NzaC1lZDI1NTE5AAAAIFOG6kY7Rf4UtCFv
+PwKgo/BztXck2xC4a2WyA34XtIwZAAAAoC13U47yfUOSZJePNUAwWXuFOk3aOKwPM5PMvK
+0zwRnMZZjgn+tsMAYPwhsT3Mx3h5QzvVGFyFEqsiK7j4vAotD+LVQeBN5TwWbUBx4lnoGs
+3iAfYVDakO/gNvVBDDGOqv5kdCc4cgn5HacjHQLKOAx6KzHe7JFn7uCywMdVVQjlpI6LHb
+mHkaKiVX/C2oiRnsoe17HZ8Fxyt3vd1qNM8BE=
 -----END OPENSSH PRIVATE KEY-----