[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  28991705b71d47066997c0afe5060b470c5ac09f (commit)
      from  72afe2fdc7ae856155aea0efb8a33ad8bc128233 (commit)


- Log -----------------------------------------------------------------
commit 28991705b71d47066997c0afe5060b470c5ac09f
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Mar 21 13:18:32 2017 +0100

    Fix test/recipes/80-test_ssl_old.t
    
    Cherry-pick error
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/3006)

-----------------------------------------------------------------------

Summary of changes:
 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 c4800d3..1cce9fb 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");
                }
 	    }