[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  548d0153cc81439547f511adeb252c52c898794b (commit)
      from  593a2aa3eb8e0153ff0b6af72b1af3327b46a19e (commit)


- Log -----------------------------------------------------------------
commit 548d0153cc81439547f511adeb252c52c898794b
Author: Matt Caswell <matt at openssl.org>
Date:   Mon Mar 6 10:03:53 2017 +0000

    Fix a test failure with no-tls1_1
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2857)

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

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

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 5f44334..4173157 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -56,6 +56,7 @@ my $no_ocsp = disabled("ocsp");
 my %conf_dependent_tests = (
   "02-protocol-version.conf" => !$is_default_tls,
   "04-client_auth.conf" => !$is_default_tls,
+  "05-sni.conf" => disabled("tls1_1"),
   "07-dtls-protocol-version.conf" => !$is_default_dtls,
   "10-resumption.conf" => !$is_default_tls,
   "11-dtls_resumption.conf" => !$is_default_dtls,