From: Rich Salz <rsalz@openssl.org>
Date: Mon, 16 Jan 2017 19:30:59 +0000 (-0500)
Subject: Skip ECDH tests for SSLv3
X-Git-Tag: OpenSSL_1_1_0d~36
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=df0d9c6950ce194601a0513afa5af77cc9d78d8c;p=oweals%2Fopenssl.git

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)
---

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",