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

Recognise fipscheck option and call fipsas for WIN64 builds.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-06-30 19:18:41 +00:00
parent be6ddecb8b
commit 01f06617b1
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
util/mk1mf.pl
View File

@ -1375,6 +1375,7 @@ sub read_options
"fips" => \$fips, "fips" => \$fips,
"fipscanisterbuild" => [\$fips, \$fipscanisterbuild], "fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
"fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly], "fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
"fipscheck" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
); );
if (exists $valid_options{$_}) if (exists $valid_options{$_})

4
util/pl/VC-32.pl
View File

@ -64,6 +64,10 @@ if ($FLAVOR =~ /WIN64/)
\$(TMP_D)$o$bname.asm: $source \$(TMP_D)$o$bname.asm: $source
set ASM=\$(ASM) set ASM=\$(ASM)
\$(PERL) $source \$\@ \$(PERL) $source \$\@
___
$ret .= "\t\$(PERL) util\\fipsas.pl . \$@ norunasm \$(CFLAG)\n" if $fipscanisterbuild;
$ret.=<<___;
$target: \$(TMP_D)$o$bname.asm $target: \$(TMP_D)$o$bname.asm
\$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm \$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm