summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2020-06-19 18:38:39 +1000
committerDarren Tucker <dtucker@dtucker.net>2020-06-19 18:38:39 +1000
commite684b1ea365e070433f282a3c1dabc3e2311ce49 (patch)
tree88c7b5897d21630e54197fc43830a44b8a7401de /regress
parent80610e97a76407ca982e62fd051c9be03622fe7b (diff)
Skip OpenSSL specific tests w/out OpenSSL.
Allows unit tests to pass when configure'ed --without-openssl.
Diffstat (limited to 'regress')
-rw-r--r--regress/unittests/sshkey/test_file.c2
-rw-r--r--regress/unittests/sshsig/tests.c8
2 files changed, 10 insertions, 0 deletions
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)
422 422
423 sshkey_free(k1); 423 sshkey_free(k1);
424 424
425#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
425 TEST_START("parse ECDSA-SK from private"); 426 TEST_START("parse ECDSA-SK from private");
426 buf = load_file("ecdsa_sk1"); 427 buf = load_file("ecdsa_sk1");
427 ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0); 428 ASSERT_INT_EQ(sshkey_parse_private_fileblob(buf, "", &k1, NULL), 0);
@@ -485,6 +486,7 @@ sshkey_file_tests(void)
485 TEST_DONE(); 486 TEST_DONE();
486 487
487 sshkey_free(k1); 488 sshkey_free(k1);
489#endif
488 490
489 TEST_START("parse Ed25519-SK from private"); 491 TEST_START("parse Ed25519-SK from private");
490 buf = load_file("ed25519_sk1"); 492 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)
80 log_init("test_sshsig", SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 1); 80 log_init("test_sshsig", SYSLOG_LEVEL_DEBUG3, SYSLOG_FACILITY_AUTH, 1);
81#endif 81#endif
82 82
83#ifdef WITH_OPENSSL
83 OpenSSL_add_all_algorithms(); 84 OpenSSL_add_all_algorithms();
84 ERR_load_CRYPTO_strings(); 85 ERR_load_CRYPTO_strings();
86#endif
85 87
86 TEST_START("load data"); 88 TEST_START("load data");
87 msg = load_file("namespace"); 89 msg = load_file("namespace");
@@ -91,6 +93,7 @@ tests(void)
91 msg = load_file("signed-data"); 93 msg = load_file("signed-data");
92 TEST_DONE(); 94 TEST_DONE();
93 95
96#ifdef WITH_OPENSSL
94 TEST_START("check RSA signature"); 97 TEST_START("check RSA signature");
95 check_sig("rsa", "rsa.sig", msg, namespace); 98 check_sig("rsa", "rsa.sig", msg, namespace);
96 TEST_DONE(); 99 TEST_DONE();
@@ -99,17 +102,22 @@ tests(void)
99 check_sig("dsa", "dsa.sig", msg, namespace); 102 check_sig("dsa", "dsa.sig", msg, namespace);
100 TEST_DONE(); 103 TEST_DONE();
101 104
105#ifdef OPENSSL_HAS_ECC
102 TEST_START("check ECDSA signature"); 106 TEST_START("check ECDSA signature");
103 check_sig("ecdsa", "ecdsa.sig", msg, namespace); 107 check_sig("ecdsa", "ecdsa.sig", msg, namespace);
104 TEST_DONE(); 108 TEST_DONE();
109#endif
110#endif
105 111
106 TEST_START("check ED25519 signature"); 112 TEST_START("check ED25519 signature");
107 check_sig("ed25519", "ed25519.sig", msg, namespace); 113 check_sig("ed25519", "ed25519.sig", msg, namespace);
108 TEST_DONE(); 114 TEST_DONE();
109 115
116#if defined(WITH_OPENSSL) && defined(OPENSSL_HAS_ECC)
110 TEST_START("check ECDSA-SK signature"); 117 TEST_START("check ECDSA-SK signature");
111 check_sig("ecdsa_sk", "ecdsa_sk.sig", msg, namespace); 118 check_sig("ecdsa_sk", "ecdsa_sk.sig", msg, namespace);
112 TEST_DONE(); 119 TEST_DONE();
120#endif
113 121
114 TEST_START("check ED25519-SK signature"); 122 TEST_START("check ED25519-SK signature");
115 check_sig("ed25519_sk", "ed25519_sk.sig", msg, namespace); 123 check_sig("ed25519_sk", "ed25519_sk.sig", msg, namespace);