From a7a7643a5317dc8d539422ee30d8b916dd3b71a8 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 20 Apr 2020 14:05:47 +0100 Subject: [PATCH 1/1] 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 (Merged from https://github.com/openssl/openssl/pull/11582) --- test/recipes/03-test_fipsinstall.t | 19 ++++++++++++------- 1 file 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, -- 2.25.1