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 c4800d3e4f72a72a562776b9046eb536131d93b5..1cce9fb5404ae7a0b0d36ea6b498fd6c24bb4e22 100644 (file)
--- 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");
                }
            }