From d253c9cd305fb60c39137aba804bbdef1390b086 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 12 Nov 2014 10:05:01 +0000 Subject: [PATCH] Fixed cms-test.pl for no-ec2m Reviewed-by: Dr. Stephen Henson --- test/cms-test.pl | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/test/cms-test.pl b/test/cms-test.pl index 006733a6be..595ab48fa9 100644 --- a/test/cms-test.pl +++ b/test/cms-test.pl @@ -83,6 +83,7 @@ my $halt_err = 1; my $badcmd = 0; my $no_ec; +my $no_ec2m; my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/; system ("$ossl_path no-ec >/dev/null"); @@ -98,7 +99,21 @@ else { 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 = ( [ @@ -492,6 +507,11 @@ sub run_smime_tests { print "$tnam: skipped, EC disabled\n"; next; } + if ($no_ec2m && $tnam =~ /K-283/) + { + print "$tnam: skipped, EC2M disabled\n"; + next; + } system("$scmd$rscmd$redir"); if ($?) { print "$tnam: generation error\n"; -- 2.25.1