mark all block comments that need format preserving so that

[openssl.git] / test / cms-test.pl

diff --git a/test/cms-test.pl b/test/cms-test.pl
index 595ab48fa9715607d941482f660b7ddec80d5e7b..7d4ca2990a0f1f3331dda6ccefa2b2b2a80b000c 100644 (file)
--- a/test/cms-test.pl
+++ b/test/cms-test.pl
@@ -84,6 +84,7 @@ my $halt_err = 1;
 my $badcmd = 0;
 my $no_ec;
 my $no_ec2m;
+my $no_ecdh;
 my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/;
 
 system ("$ossl_path no-ec >/dev/null");
@@ -113,6 +114,20 @@ else
        {
        die "Error checking for EC2M support\n";
        }
+
+system ("$ossl_path no-ecdh >/dev/null");
+if ($? == 0)
+       {
+       $no_ecdh = 1;
+       }
+elsif ($? == 256)
+       {
+       $no_ecdh = 0;
+       }
+else
+       {
+       die "Error checking for ECDH support\n";
+       }
     
 my @smime_pkcs7_tests = (
 
@@ -507,6 +522,11 @@ sub run_smime_tests {
                print "$tnam: skipped, EC disabled\n";
                next;
                }
+       if ($no_ecdh && $tnam =~ /ECDH/)
+               {
+               print "$tnam: skipped, ECDH disabled\n";
+               next;
+               }
        if ($no_ec2m && $tnam =~ /K-283/)
                {
                print "$tnam: skipped, EC2M disabled\n";