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

Don't run ECDH CMS tests if EC disabled.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2013-08-17 17:39:48 +01:00
parent 14536c8c9c
commit b85f8afe37
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/cms-test.pl
View File

@ -82,8 +82,23 @@ my $smdir = "smime-certs";
my $halt_err = 1; my $halt_err = 1;
my $badcmd = 0; my $badcmd = 0;
my $no_ec;
my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/; my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/;
system ("$ossl_path no-ec >/dev/null");
if ($? == 0)
{
$no_ec = 1;
}
elsif ($? == 1)
{
$no_ec = 0;
}
else
{
die "Error checking for EC support\n";
}
my @smime_pkcs7_tests = ( my @smime_pkcs7_tests = (
[ [
@ -472,6 +487,11 @@ sub run_smime_tests {
$rscmd =~ s/-stream//; $rscmd =~ s/-stream//;
$rvcmd =~ s/-stream//; $rvcmd =~ s/-stream//;
} }
if ($no_ec && $tnam =~ /ECDH/)
{
print "$tnam: skipped, EC disabled\n";
next;
}
system("$scmd$rscmd$redir"); system("$scmd$rscmd$redir");
if ($?) { if ($?) {
print "$tnam: generation error\n"; print "$tnam: generation error\n";