From cc9f9b98997ce3aca276dc6dbbe6d98efab4e65d Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 19 May 2021 11:46:00 +0100 Subject: Clean up the "fips" option to Configure Don't die if someone says "fips" instead of "enable-fips" Reviewed-by: Richard Levitte Reviewed-by: Matthias St. Pierre Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/15346) --- Configure | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'Configure') 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=(.*)$/) -- cgit v1.2.1