diff options
author | Matt Caswell <matt@openssl.org> | 2019-03-20 15:29:05 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2019-04-05 00:09:47 +0200 |
commit | e75455173bd0024ce11a83686bc9dad614068455 (patch) | |
tree | e9a47c582a31be5e1ad9ef63e17291c6b3079e47 | |
parent | Create a FIPS provider and put SHA256 in it (diff) | |
download | openssl-e75455173bd0024ce11a83686bc9dad614068455.tar.xz openssl-e75455173bd0024ce11a83686bc9dad614068455.zip |
Add a no-fips Configure option
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8537)
-rwxr-xr-x | Configure | 7 | ||||
-rw-r--r-- | INSTALL | 3 |
2 files changed, 8 insertions, 2 deletions
@@ -369,6 +369,7 @@ my @disablables = ( "err", "external-tests", "filenames", + "fips", "fuzz-libfuzzer", "fuzz-afl", "gost", @@ -512,6 +513,8 @@ my @disable_cascades = ( # or modules. "pic" => [ "shared", "module" ], + "module" => [ "fips" ], + "engine" => [ grep /eng$/, @disablables ], "hw" => [ "padlockeng" ], @@ -1221,8 +1224,8 @@ foreach my $what (sort keys %disabled) { $config{options} .= " no-$what"; - if (!grep { $what eq $_ } ( 'buildtest-c++', 'threads', 'shared', 'module', - 'pic', 'dynamic-engine', 'makedepend', + if (!grep { $what eq $_ } ( 'buildtest-c++', 'fips', 'threads', 'shared', + 'module', 'pic', 'dynamic-engine', 'makedepend', 'zlib-dynamic', 'zlib', 'sse2' )) { (my $WHAT = uc $what) =~ s|-|_|g; my $skipdir = $what; @@ -394,6 +394,9 @@ Don't compile in filename and line number information (e.g. for errors and memory allocation). + no-fips + Don't compile the FIPS module + enable-fuzz-libfuzzer, enable-fuzz-afl Build with support for fuzzing using either libfuzzer or AFL. These are developer options only. They may not work on all |