From 28991705b71d47066997c0afe5060b470c5ac09f Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 21 Mar 2017 13:18:32 +0100 Subject: [PATCH] Fix test/recipes/80-test_ssl_old.t Cherry-pick error Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/3006) --- test/recipes/80-test_ssl_old.t | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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"); } } -- 2.25.1