summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2021-05-19 12:46:00 +0200
committerPauli <pauli@openssl.org>2021-05-21 02:07:49 +0200
commitcc9f9b98997ce3aca276dc6dbbe6d98efab4e65d (patch)
treed50a927bc8e05fe179c23b202e62d325eaba4f99 /Configure
parentBIO_s_accept.pod: Document port auto-selection feature of BIO_set_accept_port() (diff)
downloadopenssl-cc9f9b98997ce3aca276dc6dbbe6d98efab4e65d.tar.xz
openssl-cc9f9b98997ce3aca276dc6dbbe6d98efab4e65d.zip
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)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure9
1 files changed, 1 insertions, 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=(.*)$/)