X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=util%2Ffipsdist.pl;h=b191fbe41e0b0d6abb85777c80ec0e2bb5790bc3;hp=797413f34dfcfc00c480c6bd7f1a5aefbe81f4aa;hb=f3a39032601fab2c704f03338e378592d3b4e262;hpb=dacdd5203d8353f893d394ef2a2e749b6391528f

diff --git a/util/fipsdist.pl b/util/fipsdist.pl
index 797413f34d..b191fbe41e 100644
--- 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{$_}";
 	}
 
+my $noec2m = 0;
+
 
 my @objlist = split / /, $objs;
 
@@ -18,18 +20,20 @@ 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;
 
-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{"armv4-gf2m.pl"};
-	delete $tarobjs{"x86-gf2m.pl"};
 	}
 
 my %keep = 
@@ -37,6 +41,7 @@ my %keep =
 	"Makefile.fips" => 1,
 	"Makefile.shared" => 1,
 	"README.FIPS" => 1,
+	"README.ECC" => 1,
 	"e_os.h" => 1,
 	"e_os2.h" => 1,
 	"Configure" => 1,
@@ -59,6 +64,9 @@ while (<STDIN>)
 		{
 		# 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
 		if (!/\/asm\// && !/\/Makefile$/ && !/\.(in|pl|h|S)$/)
 			{