Add mem_clr.c explicity for no-asm builds.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 22a5793e24502669e5834875a8ba9ac9ab692393..b30e47c161323d110bd20ce4c6197c1293280bab 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -710,7 +710,7 @@ my %disabled = ( # "what"         => "comment" [or special keyword "experimental
 my @experimental = ();
 
 # If ssl directory missing assume truncated FIPS tarball
-if (! -d ssl)
+if (!-d "ssl")
        {
        print STDERR "Auto Configuring fipsonly\n";
        $fips = 1;
@@ -1124,6 +1124,7 @@ my $exp_cflags = "";
 
 if ($fipscanisteronly == 2)
        {
+print STDERR "ADDING FIPSSYM\n";
        $exp_cflags .= " -DOPENSSL_FIPSSYMS";
        }
 
@@ -1717,6 +1718,10 @@ while (<IN>)
                s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.\$(SHLIB_MAJOR).dylib .dylib/;
                }
        s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/;
+       if ($fipscanisteronly == 2 && exists $disabled{"ec2m"})
+               {
+               next if (/ec2_/ || /bn_gf2m/);
+               }
        print OUT $_."\n";
        }
 close(IN);
@@ -1964,7 +1969,7 @@ EOF
            &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";',  '^my \$prefix;$', 'my $prefix = "' . $prefix . '";');
            &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
        }
-       if ($depflags ne $default_depflags && !$make_depend) {
+       if ($depflags ne $default_depflags && !$make_depend && $fipscanisteronly != 2) {
                print <<EOF;
 
 Since you've disabled or enabled at least one algorithm, you need to do