From: Darren Tucker <dtucker@dtucker.net>
Date: Fri, 19 Jun 2020 08:38:39 +0000 (+1000)
Subject: Skip OpenSSL specific tests w/out OpenSSL.
X-Git-Tag: V_8_4_P1~127
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e684b1ea365e070433f282a3c1dabc3e2311ce49;p=thirdparty%2Fopenssh-portable.git

Skip OpenSSL specific tests w/out OpenSSL.

Allows unit tests to pass when configure'ed --without-openssl.
---

diff --git a/regress/unittests/sshkey/test_file.c b/regress/unittests/sshkey/test_file.c
index 6afe3ba2b..7d767336e 100644
--- a/regress/unittests/sshkey/test_file.c
+++ b/regress/unittests/sshkey/test_file.c
@@ -422,6 +422,7 @@ sshkey_file_tests(void)
 
 	sshkey_free(k1);
 
+#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
 	TEST_START("parse ECDSA-SK from private");
 	buf = load_file("ecdsa_sk1");
 	ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
@@ -485,6 +486,7 @@ sshkey_file_tests(void)
 	TEST_DONE();
 
 	sshkey_free(k1);
+#endif
 
 	TEST_START("parse Ed25519-SK from private");
 	buf = load_file("ed25519_sk1");
diff --git a/regress/unittests/sshsig/tests.c b/regress/unittests/sshsig/tests.c
index 2d69e8d49..44dcf5ef7 100644
--- a/regress/unittests/sshsig/tests.c
+++ b/regress/unittests/sshsig/tests.c
@@ -80,8 +80,10 @@ tests(void)
         log_init("test_sshsig", SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 1);
 #endif
 
+#ifdef WITH_OPENSSL
 	OpenSSL_add_all_algorithms();
 	ERR_load_CRYPTO_strings();
+#endif
 
 	TEST_START("load data");
 	msg = load_file("namespace");
@@ -91,6 +93,7 @@ tests(void)
 	msg = load_file("signed-data");
 	TEST_DONE();
 
+#ifdef WITH_OPENSSL
 	TEST_START("check RSA signature");
 	check_sig("rsa", "rsa.sig", msg, namespace);
 	TEST_DONE();
@@ -99,17 +102,22 @@ tests(void)
 	check_sig("dsa", "dsa.sig", msg, namespace);
 	TEST_DONE();
 
+#ifdef OPENSSL_HAS_ECC
 	TEST_START("check ECDSA signature");
 	check_sig("ecdsa", "ecdsa.sig", msg, namespace);
 	TEST_DONE();
+#endif
+#endif
 
 	TEST_START("check ED25519 signature");
 	check_sig("ed25519", "ed25519.sig", msg, namespace);
 	TEST_DONE();
 
+#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
 	TEST_START("check ECDSA-SK signature");
 	check_sig("ecdsa_sk", "ecdsa_sk.sig", msg, namespace);
 	TEST_DONE();
+#endif
 
 	TEST_START("check ED25519-SK signature");
 	check_sig("ed25519_sk", "ed25519_sk.sig", msg, namespace);