generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make fipscanisteronly auto detect work on WIN32.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-04-21 16:58:51 +00:00
parent 84ed90f88b
commit e161120eff
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util/mk1mf.pl
View File

@ -58,7 +58,8 @@ my %mf_import = (
RMD160_ASM_OBJ => \$mf_rmd_asm, RMD160_ASM_OBJ => \$mf_rmd_asm,
WP_ASM_OBJ => \$mf_wp_asm, WP_ASM_OBJ => \$mf_wp_asm,
CMLL_ENC => \$mf_cm_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"; open(IN,"<Makefile") || die "unable to open Makefile!\n";
@ -74,6 +75,13 @@ close(IN);
$debug = 1 if $mf_platform =~ /^debug-/; $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 ""; die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
$infile="MINFO"; $infile="MINFO";

2
util/mkfiles.pl
View File

@ -155,7 +155,7 @@ if ($dir eq "." && defined($sym{"BUILDENV"}))
print "RELATIVE_DIRECTORY=\n"; print "RELATIVE_DIRECTORY=\n";
close (IN); close (IN);
if ($dir eq "." && $sym{CONFIGURE_ARGS} =~ /fipscanisteronly/) if ($dir eq "." && $sym{FIPSCANISTERONLY} eq "y")
{ {
$fipscanisteronly = 1; $fipscanisteronly = 1;
} }