From: Matt Caswell <matt@openssl.org>
Date: Wed, 12 Nov 2014 10:05:01 +0000 (+0000)
Subject: Fixed cms-test.pl for no-ec2m
X-Git-Tag: OpenSSL_1_0_2~193
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5a4a949904c1fead075f60f368077540a77eba75;p=oweals%2Fopenssl.git

Fixed cms-test.pl for no-ec2m

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
---

diff --git a/test/cms-test.pl b/test/cms-test.pl
index 46827f9124..b5145ad9c8 100644
--- a/test/cms-test.pl
+++ b/test/cms-test.pl
@@ -88,6 +88,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 > $null_path");
@@ -103,7 +104,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 = (
 
     [
@@ -497,6 +512,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";