From 9be92bec2eca839e26216cedc241f689c43125a5 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 20 Apr 2020 14:18:36 +0100 Subject: [PATCH] Skip a no-dsa test in the fipsinstall test In a similar way to the previous commit we also skip a fipsinstall test if DSA has been disabled. Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/11582) --- test/recipes/03-test_fipsinstall.t | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/test/recipes/03-test_fipsinstall.t b/test/recipes/03-test_fipsinstall.t index 78f496b8a1..65485fe50d 100644 --- a/test/recipes/03-test_fipsinstall.t +++ b/test/recipes/03-test_fipsinstall.t @@ -115,10 +115,14 @@ SKIP: { } # corrupt a Signature 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', 'DSA', - '-corrupt_type', 'KAT_Signature'])), - "fipsinstall fails when the signature result is corrupted"); +SKIP: { + skip "Skipping Signature DSA corruption test because of no dsa in this build", 1 + if disabled("dsa"); + 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', 'DSA', + '-corrupt_type', 'KAT_Signature'])), + "fipsinstall fails when the signature result is corrupted"); +} -- GitLab