From: Matt Caswell <matt@openssl.org>
Date: Mon, 20 Apr 2020 13:18:36 +0000 (+0100)
Subject: Skip a no-dsa test in the fipsinstall test
X-Git-Tag: openssl-3.0.0-alpha1~11
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9be92bec2eca839e26216cedc241f689c43125a5;p=oweals%2Fopenssl.git

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 <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/11582)
---

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");
+}