Get OPENSSL_FIPSSYMS from environment in fipsas.pl, include ppccap.c and .S

files in fipsdist.

diff --git a/util/fipsas.pl b/util/fipsas.pl
index 49cf564e5ce70e3d2d9202b0931ec0edd6bd7fdb..cad7c08ca202af7ad9a9473f7ae1c11d40801e82 100644 (file)
--- a/util/fipsas.pl
+++ b/util/fipsas.pl
@@ -17,12 +17,9 @@ if ($ARGS[0] eq "norunasm")
        shift @ARGS;
        }
 
-# HACK to disable operation if no OPENSSL_FIPSSYMS option.
-# will go away when tested more fully.
-
 my $enabled = 0;
 
-foreach (@ARGS) { $enabled = 1 if /-DOPENSSL_FIPSSYMS/ ; }
+$enabled = 1 if $ENV{CFLAG} =~ /-DOPENSSL_FIPSSYMS/;
 
 if ($enabled == 0 && $runasm)
        {

diff --git a/util/fipsdist.pl b/util/fipsdist.pl
index cb501e53e3e9b2afabde71d1b31bfc765bd006d6..162f5d59449c4f275195890f0c72e97e36484ce2 100644 (file)
--- a/util/fipsdist.pl
+++ b/util/fipsdist.pl
@@ -17,7 +17,7 @@ foreach (@objlist) { $tarobjs{"$1.c"} = 1 if /([^\/]+).o$/};
 
 $tarobjs{"ncbc_enc.c"} = 1;
 $tarobjs{"mem_clr.c"} = 1;
-$tarobjs{"ppc_cap.c"} = 1;
+$tarobjs{"ppccap.c"} = 1;
 
 foreach (split / /, $ENV{LINKDIRS} ) { $cdirs{$_} = 1 };
 
@@ -58,7 +58,7 @@ while (<STDIN>)
                # Skip unused directories under crypto/
                next if -d "crypto/$1" && !exists $cdirs{$1};
                # Keep assembly language dir, Makefile or certain extensions
-               if (!/\/asm\// && !/\/Makefile$/ && !/\.(in|pl|h)$/)
+               if (!/\/asm\// && !/\/Makefile$/ && !/\.(in|pl|h|S)$/)
                        {
                        # If C source file must be on list.
                        next if !/(\w+\.c)$/ || !exists $tarobjs{$1};