diff options
| author | Matt Caswell <matt@openssl.org> | 2014-11-18 16:54:07 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2014-12-16 14:17:12 +0000 |
| commit | a38ae11c48761ab468296e8960210f041b93dfde (patch) | |
| tree | 3e1f68b65be6ec5c19343335a25a7c466fd4a1e9 /test | |
| parent | 4ca0e95b92811f7dac9fff213350c248619a135c (diff) | |
| download | openssl-new-a38ae11c48761ab468296e8960210f041b93dfde.tar.gz | |
Add OPENSSL_NO_ECDH guards
Reviewed-by: Emilia Käsper <emilia@openssl.org>
(cherry picked from commit af6e2d51bfeabbae827030d4c9d58a8f7477c4a0)
Diffstat (limited to 'test')
| -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 b5145ad9c8..acd9315c8c 100644 --- a/test/cms-test.pl +++ b/test/cms-test.pl @@ -89,6 +89,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 > $null_path"); @@ -118,6 +119,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 = ( @@ -512,6 +527,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"; |