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

Fixed cms-test.pl for no-ec2m

Browse Source 
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
This commit is contained in:
Matt Caswell 2014-11-12 10:05:01 +00:00
parent cffeacd91e
commit d253c9cd30
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/cms-test.pl
View File

@ -83,6 +83,7 @@ my $halt_err = 1;
my $badcmd = 0; my $badcmd = 0;
my $no_ec; my $no_ec;
my $no_ec2m;
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"); system ("$ossl_path no-ec >/dev/null");
@ -99,6 +100,20 @@ else
die "Error checking for EC support\n"; die "Error checking for EC support\n";
} }
system ("$ossl_path no-ec2m >/dev/null");
if ($? == 0)
{
$no_ec2m = 1;
}
elsif ($? == 256)
{
$no_ec2m = 0;
}
else
{
die "Error checking for EC2M support\n";
}
my @smime_pkcs7_tests = ( my @smime_pkcs7_tests = (
[ [
@ -492,6 +507,11 @@ sub run_smime_tests {
print "$tnam: skipped, EC disabled\n"; print "$tnam: skipped, EC disabled\n";
next; next;
} }
if ($no_ec2m && $tnam =~ /K-283/)
{
print "$tnam: skipped, EC2M disabled\n";
next;
}
system("$scmd$rscmd$redir"); system("$scmd$rscmd$redir");
if ($?) { if ($?) {
print "$tnam: generation error\n"; print "$tnam: generation error\n";