diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2013-08-17 17:39:48 +0100 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2013-10-01 14:01:18 +0100 |
commit | 2fc368c1115bd789b47d070111ec898db23c58c2 (patch) | |
tree | 81e8882295628b659ef1b0c5c40eaef160a18795 | |
parent | 6ed3af7d507a48bf6153df5e8bc9d4c92ea84841 (diff) | |
download | openssl-new-2fc368c1115bd789b47d070111ec898db23c58c2.tar.gz |
Don't run ECDH CMS tests if EC disabled.
(cherry picked from commit b85f8afe3735eb77073481ffff2a4c972a6c3b21)
-rw-r--r-- | test/cms-test.pl | 20 |
1 files changed, 20 insertions, 0 deletions
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"; |