Skip ECDH tests for SSLv3
authorRich Salz <rsalz@openssl.org>
Mon, 16 Jan 2017 19:30:59 +0000 (14:30 -0500)
committerRich Salz <rsalz@openssl.org>
Wed, 18 Jan 2017 17:27:05 +0000 (12:27 -0500)
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1597)
(cherry picked from commit 4f326dd8998d5b33f72b11432f110e0f2cfcb92b)

test/recipes/80-test_ssl_old.t

index ff1a50ab8fc2eaf468c8771735f809321448eda9..77ba383f5e3c7bd83b4a3a78c338c247a513f177 100644 (file)
@@ -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",