From: Richard Levitte <levitte@openssl.org>
Date: Tue, 21 Mar 2017 12:18:32 +0000 (+0100)
Subject: Fix test/recipes/80-test_ssl_old.t
X-Git-Tag: OpenSSL_1_1_0f~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28991705b71d47066997c0afe5060b470c5ac09f;p=openssl

Fix test/recipes/80-test_ssl_old.t

Cherry-pick error

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3006)
---

diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index c4800d3e4f..1cce9fb540 100644
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -468,13 +468,15 @@ sub testssl {
 
 	foreach my $protocol (sort keys %ciphersuites) {
 	    note "Testing ciphersuites for $protocol";
+	    # ssltest_old doesn't know -tls1_2, but that's fine, since that's
+	    # the default choice if TLSv1.2 enabled
+	    my $flag = $protocol eq "-tls1_2" ? "" : $protocol;
 	    foreach my $cipher (@{$ciphersuites{$protocol}}) {
                 if ($protocol eq "-ssl3" && $cipher =~ /ECDH/ ) {
                     note "*****SKIPPING $protocol $cipher";
                     ok(1);
                 } else {
-                    ok(run(test([@ssltest, @exkeys, "-cipher", $cipher,
-                                 $protocol eq "SSLv3" ? ("-ssl3") : ()])),
+                    ok(run(test([@ssltest, @exkeys, "-cipher", $cipher, $flag])),
                        "Testing $cipher");
                }
 	    }