openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

Clean up the "fips" option to Configure 

Don't die if someone says "fips" instead of "enable-fips"

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15346)
This commit is contained in:
Matt Caswell 2021-05-19 11:46:00 +01:00 committed by Pauli
parent 8a196fe228
commit cc9f9b9899
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Configure
View File

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