[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  36d70ed51968adf9b2e7d7c67368aaccda7eabfe (commit)
      from  b3599dbb6af7e28efae5f08ace99cc75f5e90b2f (commit)


- Log -----------------------------------------------------------------
commit 36d70ed51968adf9b2e7d7c67368aaccda7eabfe
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Apr 12 08:53:31 2016 +0100

    Fix no-tls1_1 and no-tls1_2
    
    The above config options were failing in test_ssl_old.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

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

Summary of changes:
 test/recipes/80-test_ssl_old.t | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/recipes/80-test_ssl_old.t b/test/recipes/80-test_ssl_old.t
index 8138570..879ab7f 100644
--- a/test/recipes/80-test_ssl_old.t
+++ b/test/recipes/80-test_ssl_old.t
@@ -768,7 +768,7 @@ sub testssl {
         plan tests => 12;
 
         SKIP: {
-        skip "TLS disabled", 12 if $no_anytls;
+            skip "TLS1.1 or TLS1.2 disabled", 12 if $no_tls1_1 || $no_tls1_2;
             ok(run(test([@ssltest, "-server_sess_out", $server_sess, "-client_sess_out", $client_sess])));
             ok(run(test([@ssltest, "-server_sess_in", $server_sess, "-client_sess_in", $client_sess, "-should_reuse", "1", "-should_negotiate", "tls1.2"])));
             ok(run(test([@ssltest, "-server_max_proto", "tls1.1", "-server_sess_in", $server_sess, "-client_sess_in", $client_sess, "-should_reuse", "0", "-should_negotiate", "tls1.1"])));