projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
aix[64]-cc: get MT support right (gcc targets are not affected).
[openssl.git]
/
util
/
fipsdist.pl
diff --git
a/util/fipsdist.pl
b/util/fipsdist.pl
index f660c20412ada9168d5a4b4c0649390b20733f6f..b191fbe41e0b0d6abb85777c80ec0e2bb5790bc3 100644
(file)
--- a/
util/fipsdist.pl
+++ b/
util/fipsdist.pl
@@
-10,18
+10,26
@@
foreach (split / /, "FIPS_EX_OBJ AES_ENC BN_ASM DES_ENC SHA1_ASM_OBJ MODES_ASM_O
$objs .= " $ENV{$_}";
}
$objs .= " $ENV{$_}";
}
+my $noec2m = 0;
+
my @objlist = split / /, $objs;
foreach (@objlist) { $tarobjs{"$1.c"} = 1 if /([^\/]+).o$/};
$tarobjs{"ncbc_enc.c"} = 1;
my @objlist = split / /, $objs;
foreach (@objlist) { $tarobjs{"$1.c"} = 1 if /([^\/]+).o$/};
$tarobjs{"ncbc_enc.c"} = 1;
+$tarobjs{"mem_clr.c"} = 1;
+$tarobjs{"ppccap.c"} = 1;
+$tarobjs{"sparcv9cap.c"} = 1;
+$tarobjs{"armcap.c"} = 1;
foreach (split / /, $ENV{LINKDIRS} ) { $cdirs{$_} = 1 };
$cdirs{perlasm} = 1;
foreach (split / /, $ENV{LINKDIRS} ) { $cdirs{$_} = 1 };
$cdirs{perlasm} = 1;
-if (exists $ENV{NOEC2M})
+$noec2m = 1 if (exists $ENV{NOEC2M});
+
+if ($noec2m)
{
delete $tarobjs{"bn_gf2m.c"};
delete $tarobjs{"ec2_mult.c"};
{
delete $tarobjs{"bn_gf2m.c"};
delete $tarobjs{"ec2_mult.c"};
@@
-33,6
+41,7
@@
my %keep =
"Makefile.fips" => 1,
"Makefile.shared" => 1,
"README.FIPS" => 1,
"Makefile.fips" => 1,
"Makefile.shared" => 1,
"README.FIPS" => 1,
+ "README.ECC" => 1,
"e_os.h" => 1,
"e_os2.h" => 1,
"Configure" => 1,
"e_os.h" => 1,
"e_os2.h" => 1,
"Configure" => 1,
@@
-55,8
+64,11
@@
while (<STDIN>)
{
# Skip unused directories under crypto/
next if -d "crypto/$1" && !exists $cdirs{$1};
{
# Skip unused directories under crypto/
next if -d "crypto/$1" && !exists $cdirs{$1};
+ # Skip GF2m assembly language perl scripts
+ next if $noec2m && /gf2m\.pl/;
+ next if /vpaes-\w*\.pl/;
# 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.
next if !/(\w+\.c)$/ || !exists $tarobjs{$1};
{
# If C source file must be on list.
next if !/(\w+\.c)$/ || !exists $tarobjs{$1};