diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-05-06 21:42:34 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-05-06 21:42:34 +0000 |
| commit | 524289baa514dbaa457c15af59f70d0669b9528f (patch) | |
| tree | 4cb91657490bab41ac3532d3e917c5913d8e6cdf | |
| parent | 2677d856313e5af8b781af378b9cd3b35038ea33 (diff) | |
Get OPENSSL_FIPSSYMS from environment in fipsas.pl, include ppccap.c and .S
files in fipsdist.
| -rw-r--r-- | util/fipsas.pl | 5 | ||||
| -rw-r--r-- | util/fipsdist.pl | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/util/fipsas.pl b/util/fipsas.pl index 49cf564e5c..cad7c08ca2 100644 --- 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 cb501e53e3..162f5d5944 100644 --- 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}; |