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

[openssl.git] / util / fipsdist.pl

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{"ncbc_enc.c"} = 1;
 $tarobjs{"mem_clr.c"} = 1;

-$tarobjs{"ppc_cap.c"} = 1;
+$tarobjs{"ppccap.c"} = 1;

 
 foreach (split / /, $ENV{LINKDIRS} ) { $cdirs{$_} = 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
                # 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};
                        {
                        # If C source file must be on list.
                        next if !/(\w+\.c)$/ || !exists $tarobjs{$1};