Don't run ECDH CMS tests if EC disabled.

(cherry picked from commit b85f8afe3735eb77073481ffff2a4c972a6c3b21)

diff --git a/test/cms-test.pl b/test/cms-test.pl
index 287f4db34c749a5686185b5209dfbdb8142fe451..5e553c84c94f3f1482eb804980acd1cd7024d8b3 100644 (file)
--- 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";