From: Randall S. Becker <rsbecker@nexbridge.com>
Date: Mon, 22 Mar 2021 13:31:01 +0000 (-0500)
Subject: Disable fips-securitychecks if no-fips is configured.
X-Git-Tag: openssl-3.0.0-alpha14~168
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccdfcf07d9fb5e286f4a1f08df5e571869c88672;p=thirdparty%2Fopenssl.git

Disable fips-securitychecks if no-fips is configured.

Fixes: #14629

Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com>

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14634)
---

diff --git a/Configure b/Configure
index 10a988e6a3e..64d809258d0 100755
--- a/Configure
+++ b/Configure
@@ -617,6 +617,8 @@ my @disable_cascades = (
 
     "cmp"               => [ "crmf" ],
 
+    "fips"              => [ "fips-securitychecks" ],
+
     "deprecated-3.0"    => [ "engine", "srp" ]
     );