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

Make fipscanisteronly auto detect work on WIN32.

parent 84ed90f8

util/mk1mf.pl

+9 −1
Original line number Diff line number Diff line
@@ -58,7 +58,8 @@ my %mf_import = ( 
	RMD160_ASM_OBJ => \$mf_rmd_asm,

	WP_ASM_OBJ     => \$mf_wp_asm,

	CMLL_ENC       => \$mf_cm_asm,

	MODES_ASM_OBJ  => \$mf_modes_asm

	MODES_ASM_OBJ  => \$mf_modes_asm,

	FIPSCANISTERONLY  => \$mf_fipscanisteronly

);



open(IN,"<Makefile") || die "unable to open Makefile!\n";
@@ -74,6 +75,13 @@ close(IN); 


$debug = 1 if $mf_platform =~ /^debug-/;



if ($mf_fipscanisteronly eq "y") {

	$fips = 1;

	$fipscanisterbuild = 1;

	$fipscanisteronly = 1;

}





die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";



$infile="MINFO";

util/mkfiles.pl

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ if ($dir eq "." && defined($sym{"BUILDENV"})) 
print "RELATIVE_DIRECTORY=\n";



close (IN);

if ($dir eq "." && $sym{CONFIGURE_ARGS} =~ /fipscanisteronly/)

if ($dir eq "." && $sym{FIPSCANISTERONLY} eq "y")

	{

	$fipscanisteronly = 1;

	}