From: Martin Willi <martin@revosec.ch>
Date: Mon, 23 Mar 2015 08:53:34 +0000 (+0100)
Subject: unit-tests: Depend on SHA1/SHA256 features for mgf1 test cases
X-Git-Tag: 5.3.0rc1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e284a861b85c20fa84e59cc76a9095c8ff18959a;p=thirdparty%2Fstrongswan.git

unit-tests: Depend on SHA1/SHA256 features for mgf1 test cases
---

diff --git a/src/libstrongswan/tests/suites/test_mgf1.c b/src/libstrongswan/tests/suites/test_mgf1.c
index 0fb548af7f..9388b95d4f 100644
--- a/src/libstrongswan/tests/suites/test_mgf1.c
+++ b/src/libstrongswan/tests/suites/test_mgf1.c
@@ -239,20 +239,30 @@ START_TEST(mgf1_test_bitspender)
 END_TEST
 
 
-Suite *mgf1_suite_create()
+Suite *mgf1_suite_create(char *name, int n)
 {
 	Suite *s;
 	TCase *tc;
 
-	s = suite_create("mgf1");
+	s = suite_create(name);
 
 	tc = tcase_create("mgf1");
-	tcase_add_loop_test(tc, mgf1_test_mgf1, 0, countof(mgf1_tests));
+	tcase_add_loop_test(tc, mgf1_test_mgf1, n, n + 1);
 	suite_add_tcase(s, tc);
 
 	tc = tcase_create("bitspender");
-	tcase_add_loop_test(tc, mgf1_test_bitspender, 0, countof(mgf1_tests));
+	tcase_add_loop_test(tc, mgf1_test_bitspender, n, n + 1);
 	suite_add_tcase(s, tc);
 
 	return s;
 }
+
+Suite *mgf1_sha1_suite_create()
+{
+	return mgf1_suite_create("mgf1-sha1", 0);
+}
+
+Suite *mgf1_sha256_suite_create()
+{
+	return mgf1_suite_create("mgf1-sha256", 1);
+}
diff --git a/src/libstrongswan/tests/tests.h b/src/libstrongswan/tests/tests.h
index d01158649b..e1d8ca4ba0 100644
--- a/src/libstrongswan/tests/tests.h
+++ b/src/libstrongswan/tests/tests.h
@@ -44,6 +44,7 @@ TEST_SUITE(pen_suite_create)
 TEST_SUITE(asn1_suite_create)
 TEST_SUITE(asn1_parser_suite_create)
 TEST_SUITE(test_rng_suite_create)
-TEST_SUITE(mgf1_suite_create)
+TEST_SUITE_DEPEND(mgf1_sha1_suite_create, HASHER, HASH_SHA1)
+TEST_SUITE_DEPEND(mgf1_sha256_suite_create, HASHER, HASH_SHA256)
 TEST_SUITE_DEPEND(ntru_suite_create, DH, NTRU_112_BIT)
 TEST_SUITE_DEPEND(fetch_http_suite_create, FETCHER, "http://")