generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
files in fipsdist.
This commit is contained in:
Dr. Stephen Henson 2011-05-06 21:42:34 +00:00
parent 2677d85631
commit 524289baa5
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
util/fipsas.pl
View File

@ -17,12 +17,9 @@ if ($ARGS[0] eq "norunasm")
shift @ARGS; shift @ARGS;
} }
# HACK to disable operation if no OPENSSL_FIPSSYMS option.
# will go away when tested more fully.
my $enabled = 0; my $enabled = 0;
foreach (@ARGS) { $enabled = 1 if /-DOPENSSL_FIPSSYMS/ ; } $enabled = 1 if $ENV{CFLAG} =~ /-DOPENSSL_FIPSSYMS/;
if ($enabled == 0 && $runasm) if ($enabled == 0 && $runasm)
{ {

4
util/fipsdist.pl
View File

@ -17,7 +17,7 @@ foreach (@objlist) { $tarobjs{"$1.c"} = 1 if /([^\/]+).o$/};
$tarobjs{"ncbc_enc.c"} = 1; $tarobjs{"ncbc_enc.c"} = 1;
$tarobjs{"mem_clr.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/ # Skip unused directories under crypto/
next if -d "crypto/$1" && !exists $cdirs{$1}; next if -d "crypto/$1" && !exists $cdirs{$1};
# Keep assembly language dir, Makefile or certain extensions # 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. # If C source file must be on list.
next if !/(\w+\.c)$/ || !exists $tarobjs{$1}; next if !/(\w+\.c)$/ || !exists $tarobjs{$1};