summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2017-01-16 14:30:59 -0500
committerRich Salz <rsalz@openssl.org>2017-01-18 12:27:05 -0500
commitdf0d9c6950ce194601a0513afa5af77cc9d78d8c (patch)
tree3e54868fc7b3a2bfd18aafa3af813f7bdbdf6fbd /test
parent8accb70ee9aa79c322c589e01ed4a388bfdc5a95 (diff)
Skip ECDH tests for SSLv3
Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1597) (cherry picked from commit 4f326dd8998d5b33f72b11432f110e0f2cfcb92b)
Diffstat (limited to 'test')
-rw-r--r--test/recipes/80-test_ssl_old.t11
1 files changed, 8 insertions, 3 deletions
diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index ff1a50ab8f..77ba383f5e 100644
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -468,9 +468,14 @@ sub testssl {
foreach my $protocol (@protocols) {
note "Testing ciphersuites for $protocol";
foreach my $cipher (@{$ciphersuites{$protocol}}) {
- ok(run(test([@ssltest, @exkeys, "-cipher", $cipher,
- $protocol eq "SSLv3" ? ("-ssl3") : ()])),
- "Testing $cipher");
+ if ($protocol eq "SSLv3" && $cipher =~ /ECDH/ ) {
+ note "*****SKIPPING $protocol $cipher";
+ ok(1);
+ } else {
+ ok(run(test([@ssltest, @exkeys, "-cipher", $cipher,
+ $protocol eq "SSLv3" ? ("-ssl3") : ()])),
+ "Testing $cipher");
+ }
}
is(run(test([@ssltest,
"-s_cipher", "EDH",