[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  cc9f9b98997ce3aca276dc6dbbe6d98efab4e65d (commit)
      from  8a196fe228dbe5c38bbb39a9d42845257cab605c (commit)


- Log -----------------------------------------------------------------
commit cc9f9b98997ce3aca276dc6dbbe6d98efab4e65d
Author: Matt Caswell <matt at openssl.org>
Date:   Wed May 19 11:46:00 2021 +0100

    Clean up the "fips" option to Configure
    
    Don't die if someone says "fips" instead of "enable-fips"
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15346)

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

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

diff --git a/Configure b/Configure
index 635dc1c84e..e6ac9afd35 100755
--- a/Configure
+++ b/Configure
@@ -799,6 +799,7 @@ while (@argvcopy)
         s /^threads$/enable-threads/;
         s /^zlib$/enable-zlib/;
         s /^zlib-dynamic$/enable-zlib-dynamic/;
+        s /^fips$/enable-fips/;
 
         if (/^(no|disable|enable)-(.+)$/)
                 {
@@ -923,20 +924,12 @@ while (@argvcopy)
                 }
         elsif (/^386$/)
                 { $config{processor}=386; }
-        elsif (/^fips$/)
-                {
-                die "FIPS mode not supported\n";
-                }
         elsif (/^rsaref$/)
                 {
                 # No RSAref support any more since it's not needed.
                 # The check for the option is there so scripts aren't
                 # broken
                 }
-        elsif (/^nofipscanistercheck$/)
-                {
-                die "FIPS mode not supported\n";
-                }
         elsif (m|^[-+/]|)
                 {
                 if (/^--prefix=(.*)$/)