From: Michal Nowak <mnowak@isc.org>
Date: Tue, 26 Jan 2021 17:01:41 +0000 (+0100)
Subject: Drop USE_OPENSSL constraint from dh_test
X-Git-Tag: v9.17.11~45^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c341e7f740c65003e4300510c25cab2db50c1a4a;p=thirdparty%2Fbind9.git

Drop USE_OPENSSL constraint from dh_test

The USE_OPENSSL constraint in dh_test does not seems to be necessary
anymore, the test runs with PKCS#11 as well.
---

diff --git a/lib/dns/tests/dh_test.c b/lib/dns/tests/dh_test.c
index db7cac9b6ae..1f82fa57479 100644
--- a/lib/dns/tests/dh_test.c
+++ b/lib/dns/tests/dh_test.c
@@ -34,7 +34,6 @@
 #include "../dst_internal.h"
 #include "dnstest.h"
 
-#if USE_OPENSSL
 static int
 _setup(void **state) {
 	isc_result_t result;
@@ -87,21 +86,15 @@ dh_computesecret(void **state) {
 
 	dst_key_free(&key);
 }
-#endif /* USE_OPENSSL */
 
 int
 main(void) {
-#if USE_OPENSSL
 	const struct CMUnitTest tests[] = {
 		cmocka_unit_test_setup_teardown(dh_computesecret, _setup,
 						_teardown),
 	};
 
 	return (cmocka_run_group_tests(tests, NULL, NULL));
-#else  /* if USE_OPENSSL */
-	print_message("1..0 # Skipped: dh test broken with PKCS11");
-	return (SKIPPED_TEST_EXIT_CODE);
-#endif /* if USE_OPENSSL */
 }
 
 #else /* HAVE_CMOCKA */