From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 17 Aug 2013 16:39:48 +0000 (+0100)
Subject: Don't run ECDH CMS tests if EC disabled.
X-Git-Tag: master-post-reformat~1216
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=b85f8afe3735eb77073481ffff2a4c972a6c3b21;ds=inline

Don't run ECDH CMS tests if EC disabled.
---

diff --git a/test/cms-test.pl b/test/cms-test.pl
index 287f4db34c..5e553c84c9 100644
--- a/test/cms-test.pl
+++ b/test/cms-test.pl
@@ -82,8 +82,23 @@ my $smdir    = "smime-certs";
 my $halt_err = 1;
 
 my $badcmd = 0;
+my $no_ec;
 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 = (
 
     [
@@ -472,6 +487,11 @@ sub run_smime_tests {
 		$rscmd =~ s/-stream//;	
 		$rvcmd =~ s/-stream//;
 		}
+	if ($no_ec && $tnam =~ /ECDH/)
+		{
+		print "$tnam: skipped, EC disabled\n";
+		next;
+		}
         system("$scmd$rscmd$redir");
         if ($?) {
             print "$tnam: generation error\n";