projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dacdd52
)
Omit GF2m properly this time ;-)
author
Dr. Stephen Henson
<steve@openssl.org>
Sat, 7 May 2011 22:36:03 +0000
(22:36 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sat, 7 May 2011 22:36:03 +0000
(22:36 +0000)
util/fipsdist.pl
patch
|
blob
|
history
diff --git
a/util/fipsdist.pl
b/util/fipsdist.pl
index 797413f34dfcfc00c480c6bd7f1a5aefbe81f4aa..5e511f7916d5bd871dab6f56c7bd5612b30bd139 100644
(file)
--- a/
util/fipsdist.pl
+++ b/
util/fipsdist.pl
@@
-10,6
+10,8
@@
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;
my @objlist = split / /, $objs;
@@
-23,13
+25,13
@@
foreach (split / /, $ENV{LINKDIRS} ) { $cdirs{$_} = 1 };
$cdirs{perlasm} = 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{"ec2_smpl.c"};
{
delete $tarobjs{"bn_gf2m.c"};
delete $tarobjs{"ec2_mult.c"};
delete $tarobjs{"ec2_smpl.c"};
- delete $tarobjs{"armv4-gf2m.pl"};
- delete $tarobjs{"x86-gf2m.pl"};
}
my %keep =
}
my %keep =
@@
-59,6
+61,8
@@
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/;
# Keep assembly language dir, Makefile or certain extensions
if (!/\/asm\// && !/\/Makefile$/ && !/\.(in|pl|h|S)$/)
{
# Keep assembly language dir, Makefile or certain extensions
if (!/\/asm\// && !/\/Makefile$/ && !/\.(in|pl|h|S)$/)
{