wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to VC++ in-core fingerprinting support.

Browse source
This commit is contained in:
Dr. Stephen Henson 2006-01-21 22:14:07 +00:00
parent 15a6cf7d14
commit 5a175fe228
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ms/do_masm.bat
View file

@ -1,4 +1,3 @@
rem use "fips" as the first argument to make a proper FIPS build.
@echo off
echo Generating x86 for MASM assember
@ -60,7 +59,7 @@ echo on
perl util\mkfiles.pl >MINFO
rem perl util\mk1mf.pl no-sock %1 VC-MSDOS >ms\msdos.mak
rem perl util\mk1mf.pl %1 VC-W31-32 >ms\w31.mak
perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak
rem perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak
perl util\mk1mf.pl %1 VC-WIN32 >ms\nt.mak
perl util\mk1mf.pl dll %1 VC-WIN32 >ms\ntdll.mak

2
ms/do_ms.bat
View file

@ -2,7 +2,7 @@
perl util\mkfiles.pl >MINFO
rem perl util\mk1mf.pl no-sock %1 VC-MSDOS >ms\msdos.mak
rem perl util\mk1mf.pl %1 VC-W31-32 >ms\w31.mak
perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak
rem perl util\mk1mf.pl dll %1 VC-W31-32 >ms\w31dll.mak
perl util\mk1mf.pl no-asm %1 VC-WIN32 >ms\nt.mak
perl util\mk1mf.pl dll no-asm %1 VC-WIN32 >ms\ntdll.mak
perl util\mk1mf.pl no-asm %1 VC-CE >ms\ce.mak

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

@ -120,10 +120,10 @@ sub do_lib_rule
# $target="\$(LIB_D)$o$target";
$ret.="$target: $objs\n";
if (!$shlib)
{
# $ret.="\t\$(RM) \$(O_$Name)\n";
$ret.="$target: $objs\n";
$ex =' advapi32.lib';
$ret.="\t\$(MKLIB) $lfile$target @<<\n $objs $ex\n<<\n";
}
@ -134,6 +134,7 @@ sub do_lib_rule
$ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
if (defined $fips_get_sig)
{
$ret.="$target: $objs $fips_get_sig\n";
$ret.="\tSET FIPS_LINK=\$(LINK)\n";
$ret.="\tSET FIPS_CC=\$(CC)\n";
$ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c \$(SRC_D)${o}fips${o}fips_premain.c\n";
@ -145,6 +146,7 @@ sub do_lib_rule
}
else
{
$ret.="$target: $objs\n";
$ret.="\t\$(LINK) \$(MLFLAGS) $base_arg $efile$target /def:ms/${Name}.def @<<\n \$(SHLIB_EX_OBJ) $objs $ex\n<<\n";
}
}