Remove the mk1mf VC-WIN* builds and its supporting scripts
The mk1mf build for the VC-WIN* targets is broken and the unified scheme works well enough, so we clean out the old. Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Richard Levitte
parent
0351baae36
commit
753585b948
8 changed files with 1 additions and 651 deletions
|
|
@ -1,82 +0,0 @@
|
|||
@echo off
|
||||
|
||||
SET ASM=%1
|
||||
SET EXARG=
|
||||
|
||||
if NOT X%PROCESSOR_ARCHITECTURE% == X goto defined
|
||||
|
||||
echo Processor Architecture Undefined: defaulting to X86
|
||||
|
||||
goto X86
|
||||
|
||||
:defined
|
||||
|
||||
if %PROCESSOR_ARCHITECTURE% == x86 goto X86
|
||||
|
||||
if %PROCESSOR_ARCHITECTURE% == IA64 goto IA64
|
||||
|
||||
if %PROCESSOR_ARCHITECTURE% == AMD64 goto AMD64
|
||||
|
||||
echo Processor Architecture Unrecognized: defaulting to X86
|
||||
|
||||
:X86
|
||||
echo Auto Configuring for X86
|
||||
|
||||
SET TARGET=VC-WIN32
|
||||
if x%ASM% == xno-asm goto compile
|
||||
SET ASM=nasm
|
||||
|
||||
goto compile
|
||||
|
||||
:IA64
|
||||
|
||||
echo Auto Configuring for IA64
|
||||
SET TARGET=VC-WIN64I
|
||||
|
||||
goto compile
|
||||
|
||||
:AMD64
|
||||
|
||||
echo Auto Configuring for AMD64
|
||||
SET TARGET=VC-WIN64A
|
||||
if x%ASM% == xno-asm goto compile
|
||||
SET ASM=nasm
|
||||
|
||||
:compile
|
||||
|
||||
if x%ASM% == xno-asm SET EXARG=no-asm
|
||||
perl Configure %TARGET% %EXARG% fipscheck
|
||||
pause
|
||||
|
||||
echo on
|
||||
|
||||
perl util\mkfiles.pl >MINFO
|
||||
@if ERRORLEVEL 1 goto error
|
||||
perl util\mk1mf.pl dll %ASM% %TARGET% >ms\ntdll.mak
|
||||
@if ERRORLEVEL 1 goto error
|
||||
|
||||
nmake -f ms\ntdll.mak clean
|
||||
nmake -f ms\ntdll.mak
|
||||
@if ERRORLEVEL 1 goto error
|
||||
nmake -f ms\ntdll.mak install
|
||||
@if ERRORLEVEL 1 goto error
|
||||
|
||||
@echo.
|
||||
@echo.
|
||||
@echo.
|
||||
@echo ***************************
|
||||
@echo ****FIPS BUILD SUCCESS*****
|
||||
@echo ***************************
|
||||
|
||||
@goto end
|
||||
|
||||
:error
|
||||
|
||||
@echo.
|
||||
@echo.
|
||||
@echo.
|
||||
@echo ***************************
|
||||
@echo ****FIPS BUILD FAILURE*****
|
||||
@echo ***************************
|
||||
|
||||
:end
|
||||
11
ms/do_ms.bat
11
ms/do_ms.bat
|
|
@ -1,11 +0,0 @@
|
|||
|
||||
perl util\mkfiles.pl >MINFO
|
||||
perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
|
||||
perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
|
||||
if x%OSVERSION% == x goto skipce
|
||||
perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak
|
||||
perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
|
||||
:skipce
|
||||
|
||||
perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def
|
||||
perl util\mkdef.pl 32 libssl > ms\libssl32.def
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
|
||||
perl util\mkfiles.pl >MINFO
|
||||
perl util\mk1mf.pl nasm VC-WIN32 >ms\nt.mak
|
||||
perl util\mk1mf.pl dll nasm VC-WIN32 >ms\ntdll.mak
|
||||
|
||||
perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def
|
||||
perl util\mkdef.pl 32 libssl > ms\libssl32.def
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
perl util\mkfiles.pl >MINFO
|
||||
|
||||
cmd /c "nasm -f win64 -v" >NUL 2>&1
|
||||
if %errorlevel% neq 0 goto ml64
|
||||
|
||||
perl ms\uplink-x86_64.pl nasm > ms\uptable.asm
|
||||
nasm -f win64 -o ms\uptable.obj ms\uptable.asm
|
||||
goto proceed
|
||||
|
||||
:ml64
|
||||
perl ms\uplink-x86_64.pl masm > ms\uptable.asm
|
||||
ml64 -c -Foms\uptable.obj ms\uptable.asm
|
||||
|
||||
:proceed
|
||||
perl util\mk1mf.pl VC-WIN64A >ms\nt.mak
|
||||
perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak
|
||||
|
||||
perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def
|
||||
perl util\mkdef.pl 32 libssl > ms\libssl32.def
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
|
||||
perl util\mkfiles.pl >MINFO
|
||||
perl ms\uplink-ia64.pl > ms\uptable.asm
|
||||
ias -o ms\uptable.obj ms\uptable.asm
|
||||
perl util\mk1mf.pl VC-WIN64I >ms\nt.mak
|
||||
perl util\mk1mf.pl dll VC-WIN64I >ms\ntdll.mak
|
||||
|
||||
perl util\mkdef.pl 32 libcrypto > ms\libcrypto32.def
|
||||
perl util\mkdef.pl 32 libssl > ms\libssl32.def
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# generate the Microsoft makefiles and .def files
|
||||
#
|
||||
|
||||
PATH=util:../util:$PATH
|
||||
|
||||
# perl util/mk1mf.pl no-sock VC-MSDOS >ms/msdos.mak
|
||||
# perl util/mk1mf.pl VC-W31-32 >ms/w31.mak
|
||||
perl util/mk1mf.pl dll VC-WIN16 >ms/w31dll.mak
|
||||
# perl util/mk1mf.pl VC-WIN32 >ms/nt.mak
|
||||
perl util/mk1mf.pl dll VC-WIN32 >ms/ntdll.mak
|
||||
perl util/mk1mf.pl Mingw32 >ms/mingw32.mak
|
||||
perl util/mk1mf.pl Mingw32-files >ms/mingw32f.mak
|
||||
|
||||
perl util/mkdef.pl 16 libcrypto > ms/libcrypto16.def
|
||||
perl util/mkdef.pl 32 libcrypto > ms/libcrypto32.def
|
||||
perl util/mkdef.pl 16 libssl > ms/libssl16.def
|
||||
perl util/mkdef.pl 32 libssl > ms/libssl32.def
|
||||
|
|
@ -99,11 +99,6 @@ die "Makefile is not the toplevel Makefile!\n" if $ssl_version eq "";
|
|||
$infile="MINFO";
|
||||
|
||||
%ops=(
|
||||
"VC-WIN32", "Microsoft Visual C++ [4-6] - Windows NT or 9X",
|
||||
"VC-WIN64I", "Microsoft C/C++ - Win64/IA-64",
|
||||
"VC-WIN64A", "Microsoft C/C++ - Win64/x64",
|
||||
"VC-CE", "Microsoft eMbedded Visual C++ 3.0 - Windows CE ONLY",
|
||||
"VC-NT", "Microsoft Visual C++ [4-6] - Windows NT ONLY",
|
||||
"Mingw32", "GNU C++ - Windows NT or 9x",
|
||||
"Mingw32-files", "Create files with DOS copy ...",
|
||||
"linux-elf","Linux elf",
|
||||
|
|
@ -201,13 +196,7 @@ if ($platform eq "auto" || $platform eq 'copy') {
|
|||
print STDERR "Imported platform $mf_platform\n";
|
||||
}
|
||||
|
||||
if (($platform =~ /VC-(.+)/))
|
||||
{
|
||||
$FLAVOR=$1;
|
||||
$NT = 1 if $1 eq "NT";
|
||||
require 'VC-32.pl';
|
||||
}
|
||||
elsif ($platform eq "Mingw32")
|
||||
if ($platform eq "Mingw32")
|
||||
{
|
||||
require 'Mingw32.pl';
|
||||
}
|
||||
|
|
@ -856,19 +845,6 @@ foreach (values %lib_nam)
|
|||
$rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib);
|
||||
}
|
||||
|
||||
# hack to add version info on MSVC
|
||||
if (($platform eq "VC-WIN32") || ($platform eq "VC-WIN64A")
|
||||
|| ($platform eq "VC-WIN64I") || ($platform eq "VC-NT")) {
|
||||
$rules.= <<"EOF";
|
||||
\$(OBJ_D)\\\$(CRYPTO).res: ms\\version32.rc
|
||||
\$(RSC) /fo"\$(OBJ_D)\\\$(CRYPTO).res" /d CRYPTO ms\\version32.rc
|
||||
|
||||
\$(OBJ_D)\\\$(SSL).res: ms\\version32.rc
|
||||
\$(RSC) /fo"\$(OBJ_D)\\\$(SSL).res" /d SSL ms\\version32.rc
|
||||
|
||||
EOF
|
||||
}
|
||||
|
||||
$defs.=&do_defs("T_EXE",$test,"\$(TEST_D)",$exep);
|
||||
foreach (split(/\s+/,$test))
|
||||
{
|
||||
|
|
@ -1123,14 +1099,6 @@ sub do_defs
|
|||
$Vars{$var}.="$t ";
|
||||
$ret.=$t;
|
||||
}
|
||||
# hack to add version info on MSVC
|
||||
if ($shlib && (($platform eq "VC-WIN32") || ($platfrom eq "VC-WIN64I") || ($platform eq "VC-WIN64A") || ($platform eq "VC-NT")))
|
||||
{
|
||||
if ($var eq "CRYPTOOBJ")
|
||||
{ $ret.="\$(OBJ_D)\\\$(CRYPTO).res "; }
|
||||
elsif ($var eq "SSLOBJ")
|
||||
{ $ret.="\$(OBJ_D)\\\$(SSL).res "; }
|
||||
}
|
||||
chomp($ret); # Does this actually do something? /RL
|
||||
$ret.="\n\n";
|
||||
return($ret);
|
||||
|
|
|
|||
471
util/pl/VC-32.pl
471
util/pl/VC-32.pl
|
|
@ -1,471 +0,0 @@
|
|||
#!/usr/local/bin/perl
|
||||
# VC-32.pl - unified script for Microsoft Visual C++, covering Win32,
|
||||
# Win64 and WinCE [follow $FLAVOR variable to trace the differences].
|
||||
#
|
||||
|
||||
$ssl= "libssl32";
|
||||
$crypto="libcrypto32";
|
||||
|
||||
if ($fips && !$shlib)
|
||||
{
|
||||
$crypto="libcryptofips32";
|
||||
$crypto_compat = "libcryptocompat32.lib";
|
||||
}
|
||||
else
|
||||
{
|
||||
$crypto="libcrypto32";
|
||||
}
|
||||
|
||||
if ($fipscanisterbuild)
|
||||
{
|
||||
$fips_canister_path = "\$(LIB_D)\\fipscanister.lib";
|
||||
}
|
||||
|
||||
$o='\\';
|
||||
$cp='$(PERL) util/copy.pl';
|
||||
$cp2='$(PERL) util/copy.pl -stripcr';
|
||||
$mkdir='$(PERL) util/mkdir-p.pl';
|
||||
$rm='del /Q';
|
||||
$mv='move /Y';
|
||||
|
||||
$zlib_lib="zlib1.lib";
|
||||
|
||||
# Santize -L options for ms link
|
||||
$l_flags =~ s/-L("\[^"]+")/\/libpath:$1/g;
|
||||
$l_flags =~ s/-L(\S+)/\/libpath:$1/g;
|
||||
|
||||
# C compiler stuff
|
||||
$cc='cl';
|
||||
if ($FLAVOR =~ /WIN64/)
|
||||
{
|
||||
# Note that we currently don't have /WX on Win64! There is a lot of
|
||||
# warnings, but only of two types:
|
||||
#
|
||||
# C4344: conversion from '__int64' to 'int/long', possible loss of data
|
||||
# C4267: conversion from 'size_t' to 'int/long', possible loss of data
|
||||
#
|
||||
# Amount of latter type is minimized by aliasing strlen to function of
|
||||
# own desing and limiting its return value to 2GB-1 (see e_os.h). As
|
||||
# per 0.9.8 release remaining warnings were explicitly examined and
|
||||
# considered safe to ignore.
|
||||
#
|
||||
$base_cflags= " $mf_cflag" . ($mf_shared_cflag ? " $mf_shared_cflag" : "");
|
||||
my $f = ($shlib and !$fipscanisterbuild)?' /MD':' /MT';
|
||||
$opt_cflags=$f.' /Ox';
|
||||
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
|
||||
$lflags="/nologo /subsystem:console /opt:ref";
|
||||
|
||||
*::perlasm_compile_target = sub {
|
||||
my ($target,$source,$bname)=@_;
|
||||
my $ret;
|
||||
|
||||
$bname =~ s/(.*)\.[^\.]$/$1/;
|
||||
$ret=<<___;
|
||||
\$(TMP_D)$o$bname.asm: $source
|
||||
set ASM=\$(ASM)
|
||||
\$(PERL) $source \$\@
|
||||
___
|
||||
$ret .= "\t\$(PERL) util\\fipsas.pl . \$@ norunasm \$(CFLAG)\n" if $fipscanisterbuild;
|
||||
|
||||
$ret.=<<___;
|
||||
|
||||
$target: \$(TMP_D)$o$bname.asm
|
||||
\$(ASM) $afile\$\@ \$(TMP_D)$o$bname.asm
|
||||
|
||||
___
|
||||
}
|
||||
}
|
||||
elsif ($FLAVOR =~ /CE/)
|
||||
{
|
||||
# sanity check
|
||||
die '%OSVERSION% is not defined' if (!defined($ENV{'OSVERSION'}));
|
||||
die '%PLATFORM% is not defined' if (!defined($ENV{'PLATFORM'}));
|
||||
die '%TARGETCPU% is not defined' if (!defined($ENV{'TARGETCPU'}));
|
||||
|
||||
#
|
||||
# Idea behind this is to mimic flags set by eVC++ IDE...
|
||||
#
|
||||
$wcevers = $ENV{'OSVERSION'}; # WCENNN
|
||||
die '%OSVERSION% value is insane' if ($wcevers !~ /^WCE([1-9])([0-9]{2})$/);
|
||||
$wcecdefs = "-D_WIN32_WCE=$1$2 -DUNDER_CE=$1$2"; # -D_WIN32_WCE=NNN
|
||||
$wcelflag = "/subsystem:windowsce,$1.$2"; # ...,N.NN
|
||||
|
||||
$wceplatf = $ENV{'PLATFORM'};
|
||||
$wceplatf =~ tr/a-z0-9 /A-Z0-9_/d;
|
||||
$wcecdefs .= " -DWCE_PLATFORM_$wceplatf";
|
||||
|
||||
$wcetgt = $ENV{'TARGETCPU'}; # just shorter name...
|
||||
SWITCH: for($wcetgt) {
|
||||
/^X86/ && do { $wcecdefs.=" -Dx86 -D_X86_ -D_i386_ -Di_386_";
|
||||
$wcelflag.=" /machine:X86"; last; };
|
||||
/^ARMV4[IT]/ && do { $wcecdefs.=" -DARM -D_ARM_ -D$wcetgt";
|
||||
$wcecdefs.=" -DTHUMB -D_THUMB_" if($wcetgt=~/T$/);
|
||||
$wcecdefs.=" -QRarch4T -QRinterwork-return";
|
||||
$wcelflag.=" /machine:THUMB"; last; };
|
||||
/^ARM/ && do { $wcecdefs.=" -DARM -D_ARM_ -D$wcetgt";
|
||||
$wcelflag.=" /machine:ARM"; last; };
|
||||
/^MIPSIV/ && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
|
||||
$wcecdefs.=" -D_MIPS64 -QMmips4 -QMn32";
|
||||
$wcelflag.=" /machine:MIPSFPU"; last; };
|
||||
/^MIPS16/ && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
|
||||
$wcecdefs.=" -DMIPSII -QMmips16";
|
||||
$wcelflag.=" /machine:MIPS16"; last; };
|
||||
/^MIPSII/ && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000 -D$wcetgt";
|
||||
$wcecdefs.=" -QMmips2";
|
||||
$wcelflag.=" /machine:MIPS"; last; };
|
||||
/^R4[0-9]{3}/ && do { $wcecdefs.=" -DMIPS -D_MIPS_ -DR4000";
|
||||
$wcelflag.=" /machine:MIPS"; last; };
|
||||
/^SH[0-9]/ && do { $wcecdefs.=" -D$wcetgt -D_$wcetgt_ -DSHx";
|
||||
$wcecdefs.=" -Qsh4" if ($wcetgt =~ /^SH4/);
|
||||
$wcelflag.=" /machine:$wcetgt"; last; };
|
||||
{ $wcecdefs.=" -D$wcetgt -D_$wcetgt_";
|
||||
$wcelflag.=" /machine:$wcetgt"; last; };
|
||||
}
|
||||
|
||||
$cc=($ENV{CC} or "cl");
|
||||
$base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYS_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -DOPENSSL_SMALL_FOOTPRINT';
|
||||
$base_cflags.=" $wcecdefs";
|
||||
$base_cflags.=' -I$(WCECOMPAT)/include' if (defined($ENV{'WCECOMPAT'}));
|
||||
$base_cflags.=' -I$(PORTSDK_LIBPATH)/../../include' if (defined($ENV{'PORTSDK_LIBPATH'}));
|
||||
if (`$cc 2>&1` =~ /Version ([0-9]+)\./ && $1>=14) {
|
||||
$base_cflags.=($shlib and !$fipscanisterbuild)?' /MD':' /MT';
|
||||
} else {
|
||||
$base_cflags.=' /MC';
|
||||
}
|
||||
$opt_cflags=' /O1i'; # optimize for space, but with intrinsics...
|
||||
$dbg_cflags=' /Od -DDEBUG -D_DEBUG';
|
||||
$lflags="/nologo /opt:ref $wcelflag";
|
||||
}
|
||||
else # Win32
|
||||
{
|
||||
$base_cflags= " $mf_cflag" . ($mf_shared_cflag ? " $mf_shared_cflag" : "");
|
||||
my $f = ($shlib and !$fipscanisterbuild)?' /MD':' /MT';
|
||||
$opt_cflags=$f.' /Ox /O2 /Ob2';
|
||||
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
|
||||
$lflags="/nologo /subsystem:console /opt:ref";
|
||||
}
|
||||
$lib_cflag='/Zl' if (!$shlib or $fipscanisterbuild); # remove /DEFAULTLIBs
|
||||
$mlflags='';
|
||||
|
||||
$out_def ="out32"; $out_def.="dll" if ($shlib);
|
||||
$out_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
|
||||
$tmp_def ="tmp32"; $tmp_def.="dll" if ($shlib);
|
||||
$tmp_def.='_$(TARGETCPU)' if ($FLAVOR =~ /CE/);
|
||||
$inc_def="inc32";
|
||||
|
||||
if ($debug)
|
||||
{
|
||||
$cflags=$dbg_cflags.$base_cflags;
|
||||
}
|
||||
else
|
||||
{
|
||||
$cflags=$opt_cflags.$base_cflags;
|
||||
}
|
||||
|
||||
# generate symbols.pdb unconditionally
|
||||
$app_cflag.=" /Zi /Fd\$(TMP_D)/app";
|
||||
$lib_cflag.=" /Zi /Fd\$(TMP_D)/lib";
|
||||
$lflags.=" /debug";
|
||||
|
||||
$lflags.=" /fixed" if ($fips && $FLAVOR !~ /WIN64/);
|
||||
|
||||
$obj='.obj';
|
||||
$asm_suffix='.asm';
|
||||
$ofile="/Fo";
|
||||
|
||||
# EXE linking stuff
|
||||
$link="link";
|
||||
$rsc="rc";
|
||||
$efile="/out:";
|
||||
$exep='.exe';
|
||||
if ($no_sock) { $ex_libs=''; }
|
||||
elsif ($FLAVOR =~ /CE/) { $ex_libs='ws2.lib'; }
|
||||
else { $ex_libs='ws2_32.lib'; }
|
||||
|
||||
if ($FLAVOR =~ /CE/)
|
||||
{
|
||||
$ex_libs.=' crypt32.lib'; # for e_capi.c
|
||||
if (defined($ENV{WCECOMPAT}))
|
||||
{
|
||||
$ex_libs.= ' $(WCECOMPAT)/lib';
|
||||
if (-f "$ENV{WCECOMPAT}/lib/$ENV{TARGETCPU}/wcecompatex.lib")
|
||||
{
|
||||
$ex_libs.='/$(TARGETCPU)/wcecompatex.lib';
|
||||
}
|
||||
else
|
||||
{
|
||||
$ex_libs.='/wcecompatex.lib';
|
||||
}
|
||||
}
|
||||
$ex_libs.=' $(PORTSDK_LIBPATH)/portlib.lib' if (defined($ENV{'PORTSDK_LIBPATH'}));
|
||||
$ex_libs.=' /nodefaultlib coredll.lib corelibc.lib' if ($ENV{'TARGETCPU'} eq "X86");
|
||||
}
|
||||
else
|
||||
{
|
||||
$ex_libs.=' gdi32.lib advapi32.lib crypt32.lib user32.lib';
|
||||
$ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1` =~ /14\.00\.4[0-9]{4}\./);
|
||||
# WIN32 UNICODE build gets linked with unicows.lib for
|
||||
# backward compatibility with Win9x.
|
||||
$ex_libs="unicows.lib $ex_libs" if ($FLAVOR =~ /WIN32/ and $cflags =~ /\-DUNICODE/);
|
||||
}
|
||||
|
||||
# static library stuff
|
||||
$mklib='lib /nologo';
|
||||
$ranlib='';
|
||||
$plib="";
|
||||
$libp=".lib";
|
||||
$shlibp=($shlib)?".dll":".lib";
|
||||
$lfile='/out:';
|
||||
|
||||
$shlib_ex_obj="";
|
||||
$app_ex_obj="setargv.obj" if ($FLAVOR !~ /CE/);
|
||||
if ($FLAVOR =~ /WIN64A/) {
|
||||
if (`nasm -v 2>NUL` =~ /NASM version ([0-9]+\.[0-9]+)/ && $1 >= 2.0) {
|
||||
$asm='nasm -f win64 -DNEAR -Ox -g';
|
||||
$afile='-o ';
|
||||
} else {
|
||||
$asm='ml64 /c /Cp /Cx /Zi';
|
||||
$afile='/Fo';
|
||||
}
|
||||
} elsif ($FLAVOR =~ /WIN64I/) {
|
||||
$asm='ias -d debug';
|
||||
$afile="-o ";
|
||||
} elsif ($nasm) {
|
||||
my $ver=`nasm -v 2>NUL`;
|
||||
my $vew=`nasmw -v 2>NUL`;
|
||||
# pick newest version
|
||||
$asm=($ver ge $vew?"nasm":"nasmw")." -f win32";
|
||||
$asmtype="win32n";
|
||||
$afile='-o ';
|
||||
} else {
|
||||
$asm='ml /nologo /Cp /coff /c /Cx /Zi';
|
||||
$afile='/Fo';
|
||||
$asmtype="win32";
|
||||
}
|
||||
|
||||
$bn_asm_obj='';
|
||||
$bn_asm_src='';
|
||||
$des_enc_obj='';
|
||||
$des_enc_src='';
|
||||
$bf_enc_obj='';
|
||||
$bf_enc_src='';
|
||||
|
||||
if (!$no_asm)
|
||||
{
|
||||
win32_import_asm($mf_bn_asm, "bn", \$bn_asm_obj, \$bn_asm_src);
|
||||
win32_import_asm($mf_aes_asm, "aes", \$aes_asm_obj, \$aes_asm_src);
|
||||
win32_import_asm($mf_des_asm, "des", \$des_enc_obj, \$des_enc_src);
|
||||
win32_import_asm($mf_bf_asm, "bf", \$bf_enc_obj, \$bf_enc_src);
|
||||
win32_import_asm($mf_cast_asm, "cast", \$cast_enc_obj, \$cast_enc_src);
|
||||
win32_import_asm($mf_rc4_asm, "rc4", \$rc4_enc_obj, \$rc4_enc_src);
|
||||
win32_import_asm($mf_rc5_asm, "rc5", \$rc5_enc_obj, \$rc5_enc_src);
|
||||
win32_import_asm($mf_md5_asm, "md5", \$md5_asm_obj, \$md5_asm_src);
|
||||
win32_import_asm($mf_sha_asm, "sha", \$sha1_asm_obj, \$sha1_asm_src);
|
||||
win32_import_asm($mf_rmd_asm, "ripemd", \$rmd160_asm_obj, \$rmd160_asm_src);
|
||||
win32_import_asm($mf_wp_asm, "whrlpool", \$whirlpool_asm_obj, \$whirlpool_asm_src);
|
||||
win32_import_asm($mf_modes_asm, "modes", \$modes_asm_obj, \$modes_asm_src);
|
||||
win32_import_asm($mf_cpuid_asm, "", \$cpuid_asm_obj, \$cpuid_asm_src);
|
||||
$perl_asm = 1;
|
||||
}
|
||||
|
||||
if ($shlib && $FLAVOR !~ /CE/)
|
||||
{
|
||||
$mlflags.=" $lflags /dll";
|
||||
$lib_cflag.=" -D_WINDLL";
|
||||
#
|
||||
# Engage Applink...
|
||||
#
|
||||
$app_ex_obj.=" \$(OBJ_D)\\applink.obj /implib:\$(TMP_D)\\junk.lib";
|
||||
$cflags.=" -DOPENSSL_USE_APPLINK -I.";
|
||||
# I'm open for better suggestions than overriding $banner...
|
||||
$banner=<<'___';
|
||||
@echo Building OpenSSL
|
||||
|
||||
$(OBJ_D)\applink.obj: ms\applink.c
|
||||
$(CC) /Fo$(OBJ_D)\applink.obj $(APP_CFLAGS) -c ms\applink.c
|
||||
$(OBJ_D)\uplink.obj: ms\uplink.c ms\applink.c
|
||||
$(CC) /Fo$(OBJ_D)\uplink.obj $(SHLIB_CFLAGS) -c ms\uplink.c
|
||||
|
||||
LIBS_DEP=$(LIBS_DEP) $(OBJ_D)\applink.obj
|
||||
CRYPTOOBJ=$(OBJ_D)\uplink.obj $(CRYPTOOBJ)
|
||||
___
|
||||
$banner.=<<'___' if ($FLAVOR =~ /WIN64/);
|
||||
CRYPTOOBJ=ms\uptable.obj $(CRYPTOOBJ)
|
||||
___
|
||||
}
|
||||
elsif ($shlib && $FLAVOR =~ /CE/)
|
||||
{
|
||||
$mlflags.=" $lflags /dll";
|
||||
$lflags.=' /entry:mainCRTstartup' if(defined($ENV{'PORTSDK_LIBPATH'}));
|
||||
$lib_cflag.=" -D_WINDLL";
|
||||
$lib_cflag.=" -D_DLL" if (!$fipscanisterbuild);
|
||||
}
|
||||
|
||||
sub do_rehash_rule {
|
||||
my ($target, $deps) = @_;
|
||||
my $ret = <<"EOF";
|
||||
$target: $deps
|
||||
echo off > $target
|
||||
EOF
|
||||
return $ret
|
||||
}
|
||||
sub do_test_rule {
|
||||
my ($target, $deps, $test_cmd) = @_;
|
||||
my $ret = <<"EOF";
|
||||
$target: $deps force.$target
|
||||
set TOP=.
|
||||
set BIN_D=\$(BIN_D)
|
||||
set TEST_D=\$(TEST_D)
|
||||
set OPENSSL_ENGINES=\$(ENG_D)
|
||||
set PERL=\$(PERL)
|
||||
\$(PERL) test\\$test_cmd \$(TESTS)
|
||||
force.$target:
|
||||
EOF
|
||||
}
|
||||
|
||||
sub do_lib_rule
|
||||
{
|
||||
my($objs,$target,$name,$shlib,$ign,$base_addr) = @_;
|
||||
local($ret);
|
||||
|
||||
$taget =~ s/\//$o/g if $o ne '/';
|
||||
my $base_arg;
|
||||
if ($base_addr ne "")
|
||||
{
|
||||
$base_arg= " /base:$base_addr";
|
||||
}
|
||||
else
|
||||
{
|
||||
$base_arg = "";
|
||||
}
|
||||
if ($name ne "")
|
||||
{
|
||||
$name =~ tr/a-z/A-Z/;
|
||||
$name = "/def:ms/${name}.def";
|
||||
}
|
||||
|
||||
# $target="\$(LIB_D)$o$target";
|
||||
# $ret.="$target: $objs\n";
|
||||
if (!$shlib)
|
||||
{
|
||||
# $ret.="\t\$(RM) \$(O_$Name)\n";
|
||||
$ret.="$target: $objs\n";
|
||||
$ret.="\t\$(MKLIB) $lfile$target @<<\n $objs\n<<\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
local($ex)=($target =~ /O_CRYPTO/)?'':' $(L_CRYPTO)';
|
||||
$ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;
|
||||
|
||||
if ($fips && $target =~ /O_CRYPTO/)
|
||||
{
|
||||
$ret.="$target: $objs \$(PREMAIN_DSO_EXE)";
|
||||
$ret.="\n\tSET FIPS_LINK=\$(LINK_CMD)\n";
|
||||
$ret.="\tSET FIPS_CC=\$(CC)\n";
|
||||
$ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n";
|
||||
$ret.="\tSET PREMAIN_DSO_EXE=\$(PREMAIN_DSO_EXE)\n";
|
||||
$ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";
|
||||
$ret.="\tSET FIPS_TARGET=$target\n";
|
||||
$ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";
|
||||
$ret.="\t\$(FIPSLINK) \$(MLFLAGS) /map $base_arg $efile$target ";
|
||||
$ret.="$name @<<\n \$(SHLIB_EX_OBJ) $objs \$(EX_LIBS) ";
|
||||
$ret.="\$(OBJ_D)${o}fips_premain.obj $ex\n<<\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
$ret.="$target: $objs";
|
||||
$ret.="\n\t\$(LINK_CMD) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex \$(EX_LIBS)\n<<\n";
|
||||
}
|
||||
|
||||
$ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;2\n\n";
|
||||
}
|
||||
$ret.="\n";
|
||||
return($ret);
|
||||
}
|
||||
|
||||
sub do_link_rule
|
||||
{
|
||||
my($target,$files,$dep_libs,$libs,$standalone)=@_;
|
||||
local($ret,$_);
|
||||
$file =~ s/\//$o/g if $o ne '/';
|
||||
$n=&bname($target);
|
||||
$ret.="$target: $files $dep_libs\n";
|
||||
if ($standalone == 1)
|
||||
{
|
||||
$ret.=" \$(LINK_CMD) \$(LFLAGS) $efile$target @<<\n\t";
|
||||
$ret.= "\$(EX_LIBS) " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild);
|
||||
$ret.="$files $libs\n<<\n";
|
||||
}
|
||||
elsif ($standalone == 2)
|
||||
{
|
||||
$ret.="\tSET FIPS_LINK=\$(LINK_CMD)\n";
|
||||
$ret.="\tSET FIPS_CC=\$(CC)\n";
|
||||
$ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n";
|
||||
$ret.="\tSET PREMAIN_DSO_EXE=\n";
|
||||
$ret.="\tSET FIPS_TARGET=$target\n";
|
||||
$ret.="\tSET FIPS_SHA1_EXE=\$(FIPS_SHA1_EXE)\n";
|
||||
$ret.="\tSET FIPSLIB_D=\$(FIPSLIB_D)\n";
|
||||
$ret.="\t\$(FIPSLINK) \$(LFLAGS) /map $efile$target @<<\n";
|
||||
$ret.="\t\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n<<\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
$ret.="\t\$(LINK_CMD) \$(LFLAGS) $efile$target @<<\n";
|
||||
$ret.="\t\$(APP_EX_OBJ) $files $libs\n<<\n";
|
||||
}
|
||||
$ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n";
|
||||
return($ret);
|
||||
}
|
||||
|
||||
sub do_rlink_rule
|
||||
{
|
||||
local($target,$rl_start, $rl_mid, $rl_end,$dep_libs,$libs)=@_;
|
||||
local($ret,$_);
|
||||
my $files = "$rl_start $rl_mid $rl_end";
|
||||
|
||||
$file =~ s/\//$o/g if $o ne '/';
|
||||
$n=&bname($target);
|
||||
$ret.="$target: $files $dep_libs \$(FIPS_SHA1_EXE)\n";
|
||||
$ret.="\t\$(PERL) ms\\segrenam.pl \$\$a $rl_start\n";
|
||||
$ret.="\t\$(PERL) ms\\segrenam.pl \$\$b $rl_mid\n";
|
||||
$ret.="\t\$(PERL) ms\\segrenam.pl \$\$c $rl_end\n";
|
||||
$ret.="\t\$(MKLIB) $lfile$target @<<\n\t$files\n<<\n";
|
||||
$ret.="\t\$(FIPS_SHA1_EXE) $target > ${target}.sha1\n";
|
||||
$ret.="\t\$(PERL) util${o}copy.pl -stripcr fips${o}fips_premain.c \$(LIB_D)${o}fips_premain.c\n";
|
||||
$ret.="\t\$(CP) fips${o}fips_premain.c.sha1 \$(LIB_D)${o}fips_premain.c.sha1\n";
|
||||
$ret.="\n";
|
||||
return($ret);
|
||||
}
|
||||
|
||||
sub win32_import_asm
|
||||
{
|
||||
my ($mf_var, $asm_name, $oref, $sref) = @_;
|
||||
my $asm_dir;
|
||||
if ($asm_name eq "")
|
||||
{
|
||||
$asm_dir = "crypto\\";
|
||||
}
|
||||
else
|
||||
{
|
||||
$asm_dir = "crypto\\$asm_name\\asm\\";
|
||||
}
|
||||
|
||||
$$oref = "";
|
||||
$$sref = "";
|
||||
$mf_var =~ s/\.o//g;
|
||||
|
||||
foreach (split(/ /, $mf_var))
|
||||
{
|
||||
$$sref .= $asm_dir . $_ . ".asm ";
|
||||
}
|
||||
foreach (split(/ /, $mf_var))
|
||||
{
|
||||
$$oref .= "\$(TMP_D)\\" . $_ . ".obj ";
|
||||
}
|
||||
$$oref =~ s/ $//;
|
||||
$$sref =~ s/ $//;
|
||||
|
||||
}
|
||||
|
||||
|
||||
1;
|
||||
Loading…
Add table
Add a link
Reference in a new issue