mirror of
https://github.com/guanzhi/GmSSL.git
synced 2026-06-26 23:23:40 +08:00
update
This commit is contained in:
Zhi Guan
@@ -38,7 +38,7 @@ $efile="";
|
||||
$exep='.exe';
|
||||
if ($no_sock)
|
||||
{ $ex_libs=""; }
|
||||
else { $ex_libs="cw32mt.lib import32.lib"; }
|
||||
else { $ex_libs="cw32mt.lib import32.lib crypt32.lib ws2_32.lib"; }
|
||||
|
||||
# static library stuff
|
||||
$mklib='tlib /P64';
|
||||
@@ -51,8 +51,8 @@ $lfile='';
|
||||
$shlib_ex_obj="";
|
||||
$app_ex_obj="c0x32.obj";
|
||||
|
||||
$asm='nasmw -f obj -d__omf__';
|
||||
$asm.=" /Zi" if $debug;
|
||||
$asm=(`nasm -v 2>NUL` ge `nasmw -v 2>NUL`?"nasm":"nasmw")." -f obj -d__omf__";
|
||||
$asm.=" -g" if $debug;
|
||||
$afile='-o';
|
||||
|
||||
$bn_mulw_obj='';
|
||||
@@ -130,7 +130,7 @@ sub do_link_rule
|
||||
local($ret,$_);
|
||||
|
||||
$file =~ s/\//$o/g if $o ne '/';
|
||||
$n=&bname($targer);
|
||||
$n=&bname($target);
|
||||
$ret.="$target: $files $dep_libs\n";
|
||||
$ret.="\t\$(LINK) \$(LFLAGS) $files \$(APP_EX_OBJ), $target,, $libs\n\n";
|
||||
return($ret);
|
||||
|
||||
118
util/pl/VC-32.pl
118
util/pl/VC-32.pl
@@ -6,6 +6,16 @@
|
||||
$ssl= "ssleay32";
|
||||
$crypto="libeay32";
|
||||
|
||||
if ($fips && !$shlib)
|
||||
{
|
||||
$crypto="libeayfips32";
|
||||
$crypto_compat = "libeaycompat32.lib";
|
||||
}
|
||||
else
|
||||
{
|
||||
$crypto="libeay32";
|
||||
}
|
||||
|
||||
$o='\\';
|
||||
$cp='$(PERL) util/copy.pl';
|
||||
$mkdir='$(PERL) util/mkdir-p.pl';
|
||||
@@ -17,6 +27,8 @@ $zlib_lib="zlib1.lib";
|
||||
$l_flags =~ s/-L("\[^"]+")/\/libpath:$1/g;
|
||||
$l_flags =~ s/-L(\S+)/\/libpath:$1/g;
|
||||
|
||||
my $ff = "";
|
||||
|
||||
# C compiler stuff
|
||||
$cc='cl';
|
||||
if ($FLAVOR =~ /WIN64/)
|
||||
@@ -33,8 +45,7 @@ if ($FLAVOR =~ /WIN64/)
|
||||
# considered safe to ignore.
|
||||
#
|
||||
$base_cflags= " $mf_cflag";
|
||||
my $f = $shlib?' /MD':' /MT';
|
||||
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
|
||||
my $f = $shlib || $fips ?' /MD':' /MT';
|
||||
$opt_cflags=$f.' /Ox';
|
||||
$dbg_cflags=$f.'d /Od -DDEBUG -D_DEBUG';
|
||||
$lflags="/nologo /subsystem:console /opt:ref";
|
||||
@@ -77,7 +88,7 @@ elsif ($FLAVOR =~ /CE/)
|
||||
$wcetgt = $ENV{'TARGETCPU'}; # just shorter name...
|
||||
SWITCH: for($wcetgt) {
|
||||
/^X86/ && do { $wcecdefs.=" -Dx86 -D_X86_ -D_i386_ -Di_386_";
|
||||
$wcelflag.=" /machine:IX86"; last; };
|
||||
$wcelflag.=" /machine:X86"; last; };
|
||||
/^ARMV4[IT]/ && do { $wcecdefs.=" -DARM -D_ARM_ -D$wcetgt";
|
||||
$wcecdefs.=" -DTHUMB -D_THUMB_" if($wcetgt=~/T$/);
|
||||
$wcecdefs.=" -QRarch4T -QRinterwork-return";
|
||||
@@ -102,24 +113,30 @@ elsif ($FLAVOR =~ /CE/)
|
||||
$wcelflag.=" /machine:$wcetgt"; last; };
|
||||
}
|
||||
|
||||
$cc='$(CC)';
|
||||
$cc=($ENV{CC} or "cl");
|
||||
$base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_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'}));
|
||||
$opt_cflags=' /MC /O1i'; # optimize for space, but with intrinsics...
|
||||
$dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
|
||||
if (`$cc 2>&1` =~ /Version ([0-9]+)\./ && $1>=14) {
|
||||
$base_cflags.=$shlib?' /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";
|
||||
my $f = $shlib?' /MD':' /MT';
|
||||
$lib_cflag='/Zl' if (!$shlib); # remove /DEFAULTLIBs from static lib
|
||||
my $f = $shlib || $fips ?' /MD':' /MT';
|
||||
$ff = "/fixed";
|
||||
$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); # remove /DEFAULTLIBs from static lib
|
||||
$mlflags='';
|
||||
|
||||
$out_def ="out32"; $out_def.="dll" if ($shlib);
|
||||
@@ -152,14 +169,26 @@ $rsc="rc";
|
||||
$efile="/out:";
|
||||
$exep='.exe';
|
||||
if ($no_sock) { $ex_libs=''; }
|
||||
elsif ($FLAVOR =~ /CE/) { $ex_libs='winsock.lib'; }
|
||||
elsif ($FLAVOR =~ /CE/) { $ex_libs='ws2.lib'; }
|
||||
else { $ex_libs='ws2_32.lib'; }
|
||||
|
||||
if ($FLAVOR =~ /CE/)
|
||||
{
|
||||
$ex_libs.=' $(WCECOMPAT)/lib/wcecompatex.lib' if (defined($ENV{'WCECOMPAT'}));
|
||||
$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:oldnames.lib coredll.lib corelibc.lib' if ($ENV{'TARGETCPU'} eq "X86");
|
||||
$ex_libs.=' /nodefaultlib coredll.lib corelibc.lib' if ($ENV{'TARGETCPU'} eq "X86");
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -266,10 +295,19 @@ elsif ($shlib && $FLAVOR =~ /CE/)
|
||||
|
||||
sub do_lib_rule
|
||||
{
|
||||
local($objs,$target,$name,$shlib)=@_;
|
||||
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/;
|
||||
@@ -277,17 +315,37 @@ sub do_lib_rule
|
||||
}
|
||||
|
||||
# $target="\$(LIB_D)$o$target";
|
||||
$ret.="$target: $objs\n";
|
||||
# $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/;
|
||||
$ret.="\t\$(LINK) \$(MLFLAGS) $efile$target $name @<<\n \$(SHLIB_EX_OBJ) $objs $ex \$(EX_LIBS)\n<<\n";
|
||||
|
||||
if ($fips && $target =~ /O_CRYPTO/)
|
||||
{
|
||||
$ret.="$target: $objs \$(PREMAIN_DSO_EXE)";
|
||||
$ret.="\n\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\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) $ff /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) \$(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";
|
||||
@@ -296,15 +354,35 @@ sub do_lib_rule
|
||||
|
||||
sub do_link_rule
|
||||
{
|
||||
local($target,$files,$dep_libs,$libs)=@_;
|
||||
my($target,$files,$dep_libs,$libs,$standalone)=@_;
|
||||
local($ret,$_);
|
||||
|
||||
$file =~ s/\//$o/g if $o ne '/';
|
||||
$n=&bname($targer);
|
||||
$n=&bname($target);
|
||||
$ret.="$target: $files $dep_libs\n";
|
||||
$ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";
|
||||
$ret.=" \$(APP_EX_OBJ) $files $libs\n<<\n";
|
||||
$ret.="\tIF EXIST \$@.manifest mt -nologo -manifest \$@.manifest -outputresource:\$@;1\n\n";
|
||||
if ($standalone == 1)
|
||||
{
|
||||
$ret.=" \$(LINK) \$(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)\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) $ff /map $efile$target @<<\n";
|
||||
$ret.="\t\$(APP_EX_OBJ) $files \$(OBJ_D)${o}fips_premain.obj $libs\n<<\n";
|
||||
}
|
||||
else
|
||||
{
|
||||
$ret.="\t\$(LINK) \$(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);
|
||||
}
|
||||
|
||||
|
||||
@@ -212,7 +212,7 @@ else
|
||||
# Turned off the "possible" warnings ( -w nopossible ). Metrowerks
|
||||
# complained a lot about various stuff. May want to turn back
|
||||
# on for further development.
|
||||
$cflags.=" -nostdinc -ir crypto -ir engines -ir apps -I$include_path \\
|
||||
$cflags.=" -nostdinc -ir crypto -ir ssl -ir engines -ir apps -I$include_path \\
|
||||
-msgstyle gcc -align 4 -processor pentium -char unsigned \\
|
||||
-w on -w nolargeargs -w nopossible -w nounusedarg -w nounusedexpr \\
|
||||
-w noimplicitconv -relax_pointers -nosyspath -maxerrors 20";
|
||||
|
||||
350
util/pl/unix.pl
350
util/pl/unix.pl
@@ -26,11 +26,12 @@ else
|
||||
{ $cflags="-O"; }
|
||||
}
|
||||
$obj='.o';
|
||||
$asm_suffix='.s';
|
||||
$ofile='-o ';
|
||||
|
||||
# EXE linking stuff
|
||||
$link='${CC}';
|
||||
$lflags='${CFLAGS}';
|
||||
$lflags='${CFLAG}';
|
||||
$efile='-o ';
|
||||
$exep='';
|
||||
$ex_libs="";
|
||||
@@ -53,6 +54,93 @@ $des_enc_src="";
|
||||
$bf_enc_obj="";
|
||||
$bf_enc_src="";
|
||||
|
||||
%perl1 = (
|
||||
'md5-x86_64' => 'crypto/md5',
|
||||
'x86_64-mont' => 'crypto/bn',
|
||||
'x86_64-mont5' => 'crypto/bn',
|
||||
'x86_64-gf2m' => 'crypto/bn',
|
||||
'aes-x86_64' => 'crypto/aes',
|
||||
'vpaes-x86_64' => 'crypto/aes',
|
||||
'bsaes-x86_64' => 'crypto/aes',
|
||||
'aesni-x86_64' => 'crypto/aes',
|
||||
'aesni-sha1-x86_64' => 'crypto/aes',
|
||||
'sha1-x86_64' => 'crypto/sha',
|
||||
'e_padlock-x86_64' => 'engines',
|
||||
'rc4-x86_64' => 'crypto/rc4',
|
||||
'rc4-md5-x86_64' => 'crypto/rc4',
|
||||
'ghash-x86_64' => 'crypto/modes',
|
||||
'aesni-gcm-x86_64' => 'crypto/modes',
|
||||
'aesni-sha256-x86_64' => 'crypto/aes',
|
||||
'rsaz-x86_64' => 'crypto/bn',
|
||||
'rsaz-avx2' => 'crypto/bn',
|
||||
'aesni-mb-x86_64' => 'crypto/aes',
|
||||
'sha1-mb-x86_64' => 'crypto/sha',
|
||||
'sha256-mb-x86_64' => 'crypto/sha',
|
||||
'ecp_nistz256-x86_64' => 'crypto/ec',
|
||||
);
|
||||
|
||||
# If I were feeling more clever, these could probably be extracted
|
||||
# from makefiles.
|
||||
sub platform_perlasm_compile_target
|
||||
{
|
||||
local($target, $source, $bname) = @_;
|
||||
|
||||
for $p (keys %perl1)
|
||||
{
|
||||
if ($target eq "\$(OBJ_D)/$p.o")
|
||||
{
|
||||
return << "EOF";
|
||||
\$(TMP_D)/$p.s: $perl1{$p}/asm/$p.pl
|
||||
\$(PERL) $perl1{$p}/asm/$p.pl \$(PERLASM_SCHEME) > \$@
|
||||
EOF
|
||||
}
|
||||
}
|
||||
if ($target eq '$(OBJ_D)/x86_64cpuid.o')
|
||||
{
|
||||
return << 'EOF';
|
||||
$(TMP_D)/x86_64cpuid.s: crypto/x86_64cpuid.pl
|
||||
$(PERL) crypto/x86_64cpuid.pl $(PERLASM_SCHEME) > $@
|
||||
EOF
|
||||
}
|
||||
elsif ($target eq '$(OBJ_D)/sha256-x86_64.o')
|
||||
{
|
||||
return << 'EOF';
|
||||
$(TMP_D)/sha256-x86_64.s: crypto/sha/asm/sha512-x86_64.pl
|
||||
$(PERL) crypto/sha/asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@
|
||||
EOF
|
||||
}
|
||||
elsif ($target eq '$(OBJ_D)/sha512-x86_64.o')
|
||||
{
|
||||
return << 'EOF';
|
||||
$(TMP_D)/sha512-x86_64.s: crypto/sha/asm/sha512-x86_64.pl
|
||||
$(PERL) crypto/sha/asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@
|
||||
EOF
|
||||
}
|
||||
elsif ($target eq '$(OBJ_D)/sha512-x86_64.o')
|
||||
{
|
||||
return << 'EOF';
|
||||
$(TMP_D)/sha512-x86_64.s: crypto/sha/asm/sha512-x86_64.pl
|
||||
$(PERL) crypto/sha/asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@
|
||||
EOF
|
||||
}
|
||||
|
||||
die $target;
|
||||
}
|
||||
|
||||
sub special_compile_target
|
||||
{
|
||||
local($target) = @_;
|
||||
|
||||
if ($target eq 'crypto/bn/x86_64-gcc')
|
||||
{
|
||||
return << "EOF";
|
||||
\$(TMP_D)/x86_64-gcc.o: crypto/bn/asm/x86_64-gcc.c
|
||||
\$(CC) \$(CFLAGS) -c -o \$@ crypto/bn/asm/x86_64-gcc.c
|
||||
EOF
|
||||
}
|
||||
return undef;
|
||||
}
|
||||
|
||||
sub do_lib_rule
|
||||
{
|
||||
local($obj,$target,$name,$shlib)=@_;
|
||||
@@ -72,7 +160,7 @@ sub do_link_rule
|
||||
{
|
||||
local($target,$files,$dep_libs,$libs)=@_;
|
||||
local($ret,$_);
|
||||
|
||||
|
||||
$file =~ s/\//$o/g if $o ne '/';
|
||||
$n=&bname($target);
|
||||
$ret.="$target: $files $dep_libs\n";
|
||||
@@ -93,4 +181,262 @@ sub which
|
||||
}
|
||||
}
|
||||
|
||||
sub fixtests
|
||||
{
|
||||
my ($str, $tests) = @_;
|
||||
|
||||
foreach my $t (keys %$tests)
|
||||
{
|
||||
$str =~ s/(\.\/)?\$\($t\)/\$(TEST_D)\/$tests->{$t}/g;
|
||||
}
|
||||
|
||||
return $str;
|
||||
}
|
||||
|
||||
sub fixdeps
|
||||
{
|
||||
my ($str, $fakes) = @_;
|
||||
|
||||
my @t = split(/\s+/, $str);
|
||||
$str = '';
|
||||
foreach my $t (@t)
|
||||
{
|
||||
$str .= ' ' if $str ne '';
|
||||
if (exists($fakes->{$t}))
|
||||
{
|
||||
$str .= $fakes->{$t};
|
||||
next;
|
||||
}
|
||||
if ($t =~ /^[^\/]+$/)
|
||||
{
|
||||
$str .= '$(TEST_D)/' . $t;
|
||||
}
|
||||
else
|
||||
{
|
||||
$str .= $t;
|
||||
}
|
||||
}
|
||||
|
||||
return $str;
|
||||
}
|
||||
|
||||
sub fixrules
|
||||
{
|
||||
my ($str) = @_;
|
||||
|
||||
# Compatible with -j...
|
||||
$str =~ s/^(\s+@?)/$1cd \$(TEST_D) && /;
|
||||
return $str;
|
||||
|
||||
# Compatible with not -j.
|
||||
my @t = split("\n", $str);
|
||||
$str = '';
|
||||
my $prev;
|
||||
foreach my $t (@t)
|
||||
{
|
||||
$t =~ s/^\s+//;
|
||||
if (!$prev)
|
||||
{
|
||||
if ($t =~ /^@/)
|
||||
{
|
||||
$t =~ s/^@/\@cd \$(TEST_D) && /;
|
||||
}
|
||||
elsif ($t !~ /^\s*#/)
|
||||
{
|
||||
$t = 'cd $(TEST_D) && ' . $t;
|
||||
}
|
||||
}
|
||||
$str .= "\t$t\n";
|
||||
$prev = $t =~/\\$/;
|
||||
}
|
||||
return $str;
|
||||
}
|
||||
|
||||
sub copy_scripts
|
||||
{
|
||||
my ($sed, $src, @targets) = @_;
|
||||
|
||||
my $s = '';
|
||||
foreach my $t (@targets)
|
||||
{
|
||||
# Copy first so we get file modes...
|
||||
$s .= "\$(TEST_D)/$t: \$(SRC_D)/$src/$t\n\tcp \$(SRC_D)/$src/$t \$(TEST_D)/$t\n";
|
||||
$s .= "\tsed -e 's/\\.\\.\\/apps/..\\/\$(OUT_D)/' -e 's/\\.\\.\\/util/..\\/\$(TEST_D)/' < \$(SRC_D)/$src/$t > \$(TEST_D)/$t\n" if $sed;
|
||||
$s .= "\n";
|
||||
}
|
||||
return $s;
|
||||
}
|
||||
|
||||
sub get_tests
|
||||
{
|
||||
my ($makefile) = @_;
|
||||
|
||||
open(M, $makefile) || die "Can't open $makefile: $!";
|
||||
my %targets;
|
||||
my %deps;
|
||||
my %tests;
|
||||
my %alltests;
|
||||
my %fakes;
|
||||
while (my $line = <M>)
|
||||
{
|
||||
chomp $line;
|
||||
while ($line =~ /^(.*)\\$/)
|
||||
{
|
||||
$line = $1 . <M>;
|
||||
}
|
||||
|
||||
if ($line =~ /^alltests:(.*)$/)
|
||||
{
|
||||
my @t = split(/\s+/, $1);
|
||||
foreach my $t (@t)
|
||||
{
|
||||
$targets{$t} = '';
|
||||
$alltests{$t} = undef;
|
||||
}
|
||||
}
|
||||
|
||||
if (($line =~ /^(?<t>\S+):(?<d>.*)$/ && exists $targets{$1})
|
||||
|| $line =~ /^(?<t>test_(ss|gen) .*):(?<d>.*)/)
|
||||
{
|
||||
my $t = $+{t};
|
||||
my $d = $+{d};
|
||||
# If there are multiple targets stupid FreeBSD make runs the
|
||||
# rules once for each dependency that matches one of the
|
||||
# targets. Running the same rule twice concurrently causes
|
||||
# breakage, so replace with a fake target.
|
||||
if ($t =~ /\s/)
|
||||
{
|
||||
++$fake;
|
||||
my @targets = split /\s+/, $t;
|
||||
$t = "_fake$fake";
|
||||
foreach my $f (@targets)
|
||||
{
|
||||
$fakes{$f} = $t;
|
||||
}
|
||||
}
|
||||
$deps{$t} = $d;
|
||||
$deps{$t} =~ s/#.*$//;
|
||||
for (;;)
|
||||
{
|
||||
$line = <M>;
|
||||
chomp $line;
|
||||
last if $line eq '';
|
||||
$targets{$t} .= "$line\n";
|
||||
}
|
||||
next;
|
||||
}
|
||||
|
||||
if ($line =~ /^(\S+TEST)=\s*(\S+)$/)
|
||||
{
|
||||
$tests{$1} = $2;
|
||||
next;
|
||||
}
|
||||
}
|
||||
|
||||
delete $alltests{test_jpake} if $no_jpake;
|
||||
delete $targets{test_ige} if $no_ige;
|
||||
delete $alltests{test_md2} if $no_md2;
|
||||
delete $alltests{test_rc5} if $no_rc5;
|
||||
|
||||
my $tests;
|
||||
foreach my $t (keys %tests)
|
||||
{
|
||||
$tests .= "$t = $tests{$t}\n";
|
||||
}
|
||||
|
||||
my $each;
|
||||
foreach my $t (keys %targets)
|
||||
{
|
||||
next if $t eq '';
|
||||
|
||||
my $d = $deps{$t};
|
||||
$d =~ s/\.\.\/apps/\$(BIN_D)/g;
|
||||
$d =~ s/\.\.\/util/\$(TEST_D)/g;
|
||||
$d = fixtests($d, \%tests);
|
||||
$d = fixdeps($d, \%fakes);
|
||||
|
||||
my $r = $targets{$t};
|
||||
$r =~ s/\.\.\/apps/..\/\$(BIN_D)/g;
|
||||
$r =~ s/\.\.\/util/..\/\$(TEST_D)/g;
|
||||
$r =~ s/\.\.\/(\S+)/\$(SRC_D)\/$1/g;
|
||||
$r = fixrules($r);
|
||||
|
||||
next if $r eq '';
|
||||
|
||||
$t =~ s/\s+/ \$(TEST_D)\//g;
|
||||
|
||||
$each .= "$t: test_scripts $d\n\t\@echo '$t test started'\n$r\t\@echo '$t test done'\n\n";
|
||||
}
|
||||
|
||||
# FIXME: Might be a clever way to figure out what needs copying
|
||||
my @copies = ( 'bctest',
|
||||
'testgen',
|
||||
'cms-test.pl',
|
||||
'tx509',
|
||||
'test.cnf',
|
||||
'testenc',
|
||||
'tocsp',
|
||||
'testca',
|
||||
'CAss.cnf',
|
||||
'testtsa',
|
||||
'CAtsa.cnf',
|
||||
'Uss.cnf',
|
||||
'P1ss.cnf',
|
||||
'P2ss.cnf',
|
||||
'tcrl',
|
||||
'tsid',
|
||||
'treq',
|
||||
'tpkcs7',
|
||||
'tpkcs7d',
|
||||
'testcrl.pem',
|
||||
'testx509.pem',
|
||||
'v3-cert1.pem',
|
||||
'v3-cert2.pem',
|
||||
'testreq2.pem',
|
||||
'testp7.pem',
|
||||
'pkcs7-1.pem',
|
||||
'trsa',
|
||||
'testrsa.pem',
|
||||
'testsid.pem',
|
||||
'testss',
|
||||
'testssl',
|
||||
'testsslproxy',
|
||||
'serverinfo.pem',
|
||||
);
|
||||
my $copies = copy_scripts(1, 'test', @copies);
|
||||
$copies .= copy_scripts(0, 'test', ('smcont.txt'));
|
||||
|
||||
my @utils = ( 'shlib_wrap.sh',
|
||||
'opensslwrap.sh',
|
||||
);
|
||||
$copies .= copy_scripts(1, 'util', @utils);
|
||||
|
||||
my @apps = ( 'CA.sh',
|
||||
'openssl.cnf',
|
||||
'server2.pem',
|
||||
);
|
||||
$copies .= copy_scripts(1, 'apps', @apps);
|
||||
|
||||
$copies .= copy_scripts(1, 'crypto/evp', ('evptests.txt'));
|
||||
|
||||
$scripts = "test_scripts: \$(TEST_D)/CA.sh \$(TEST_D)/opensslwrap.sh \$(TEST_D)/openssl.cnf \$(TEST_D)/shlib_wrap.sh ocsp smime\n";
|
||||
$scripts .= "\nocsp:\n\tcp -R test/ocsp-tests \$(TEST_D)\n";
|
||||
$scripts .= "\smime:\n\tcp -R test/smime-certs \$(TEST_D)\n";
|
||||
|
||||
my $all = 'test:';
|
||||
foreach my $t (keys %alltests)
|
||||
{
|
||||
if (exists($fakes{$t}))
|
||||
{
|
||||
$all .= " $fakes{$t}";
|
||||
}
|
||||
else
|
||||
{
|
||||
$all .= " $t";
|
||||
}
|
||||
}
|
||||
|
||||
return "$scripts\n$copies\n$tests\n$all\n\n$each";
|
||||
}
|
||||
|
||||
1;
|
||||
|
||||
Reference in New Issue
Block a user