config: enable ACVP test case if FIPS is enabled.
authorPauli <pauli@openssl.org>
Fri, 16 Jul 2021 00:31:41 +0000 (10:31 +1000)
committerPauli <pauli@openssl.org>
Sat, 17 Jul 2021 07:51:08 +0000 (17:51 +1000)
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16095)

Configure

index 0ec72395dbabd1f1936d2fcc69da06ad3341b0f5..2264e090c5e99bc4e1b926db2e0d3ade008c304e 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -532,7 +532,6 @@ my %deprecated_disablables = (
 
 our %disabled = ( # "what"         => "comment"
                   "fips"                => "default",
-                  "acvp-tests"          => "default",
                   "asan"                => "default",
                   "buildtest-c++"       => "default",
                   "crypto-mdebug"       => "default",
@@ -638,7 +637,7 @@ my @disable_cascades = (
 
     "cmp"               => [ "crmf" ],
 
-    "fips"              => [ "fips-securitychecks" ],
+    "fips"              => [ "fips-securitychecks", "acvp-tests" ],
 
     "deprecated-3.0"    => [ "engine", "srp" ]
     );