summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2020-04-20 14:05:47 +0100
committerMatt Caswell <matt@openssl.org>2020-04-22 10:32:47 +0100
commita7a7643a5317dc8d539422ee30d8b916dd3b71a8 (patch)
tree8e8de70a17d6c66e1472dcf082b8bdce56341ca1
parenta033c9a2e8b1c9e5719a27ad3cadc66a866ef2c1 (diff)
Skip a test in a no-dh build
One of the sub-tests in the fipsinstall test corrupts a DH test to confirm that fipsinstall fails. However that is never noticed in a no-dh build - so we just skip that test in a no-dh build. Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/11582)
-rw-r--r--test/recipes/03-test_fipsinstall.t19
1 files changed, 12 insertions, 7 deletions
diff --git a/test/recipes/03-test_fipsinstall.t b/test/recipes/03-test_fipsinstall.t
index 024d8c7ca5..78f496b8a1 100644
--- a/test/recipes/03-test_fipsinstall.t
+++ b/test/recipes/03-test_fipsinstall.t
@@ -101,13 +101,18 @@ ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.cnf', '-module', $infile,
"fipsinstall fails when the DRBG CTR result is corrupted");
# corrupt a KAS test
-ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile,
- '-provider_name', 'fips', '-mac_name', 'HMAC',
- '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
- '-section_name', 'fips_install',
- '-corrupt_desc', 'DH',
- '-corrupt_type', 'KAT_KA'])),
- "fipsinstall fails when the kas result is corrupted");
+SKIP: {
+ skip "Skipping KAS DH corruption test because of no dh in this build", 1
+ if disabled("dh");
+
+ ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile,
+ '-provider_name', 'fips', '-mac_name', 'HMAC',
+ '-macopt', 'digest:SHA256', '-macopt', 'hexkey:00',
+ '-section_name', 'fips_install',
+ '-corrupt_desc', 'DH',
+ '-corrupt_type', 'KAT_KA'])),
+ "fipsinstall fails when the kas result is corrupted");
+}
# corrupt a Signature test
ok(!run(app(['openssl', 'fipsinstall', '-out', 'fips.conf', '-module', $infile,