[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  c3c00c7acd040f8e410fffffb5808d2f1c3ac9b9 (commit)
      from  24f84b4e4dbde9d8ef7a5ebb4b3c2ca22fd4cd22 (commit)


- Log -----------------------------------------------------------------
commit c3c00c7acd040f8e410fffffb5808d2f1c3ac9b9
Author: Pauli <pauli at openssl.org>
Date:   Fri Jul 16 10:31:41 2021 +1000

    config: enable ACVP test case if FIPS is enabled.
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16095)

-----------------------------------------------------------------------

Summary of changes:
 Configure | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Configure b/Configure
index 0ec72395db..2264e090c5 100755
--- 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" ]
     );