Commit e7545517 authored by Matt Caswell's avatar Matt Caswell
Browse files

Add a no-fips Configure option 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8537)
parent 9efa0ae0

Configure

+5 −2
Original line number Diff line number Diff line
@@ -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;

INSTALL

+3 −0
Original line number Diff line number Diff line
@@ -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