[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  ccdfcf07d9fb5e286f4a1f08df5e571869c88672 (commit)
      from  6511f686c2c56d3ed68477981c1a3821bdc2e565 (commit)


- Log -----------------------------------------------------------------
commit ccdfcf07d9fb5e286f4a1f08df5e571869c88672
Author: Randall S. Becker <rsbecker at nexbridge.com>
Date:   Mon Mar 22 08:31:01 2021 -0500

    Disable fips-securitychecks if no-fips is configured.
    
    Fixes: #14629
    
    Signed-off-by: Randall S. Becker <rsbecker at nexbridge.com>
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14634)

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

Summary of changes:
 Configure | 2 ++
 1 file changed, 2 insertions(+)

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