Commit 524289ba authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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

files in fipsdist.
parent 2677d856

util/fipsas.pl

+1 −4
Original line number Diff line number Diff line
@@ -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)

	{

util/fipsdist.pl

+2 −2
Original line number Diff line number Diff line
@@ -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};