[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  80f397e2c6898a1987ecbb5680859d398130107b (commit)
       via  3e82ae573ad7a3aa5dc99be9841ca9111e584630 (commit)
      from  49dadc1cb74dd1c83983900b5c4acb22c647af31 (commit)


- Log -----------------------------------------------------------------
commit 80f397e2c6898a1987ecbb5680859d398130107b
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jul 22 16:36:26 2016 +0100

    Fix no-tls1_2
    
    Misc fixes impacting no-tls1_2. Also fixes no-dtls1_2.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 3e82ae573ad7a3aa5dc99be9841ca9111e584630
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jul 22 16:19:23 2016 +0100

    Fix no-dtls*
    
    Also fixes some other options like no-dgram and no-sock.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 test/recipes/70-test_sslrecords.t |  4 ++--
 test/recipes/80-test_ssl_new.t    | 12 ++++++------
 test/sslapitest.c                 |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/recipes/70-test_sslrecords.t b/test/recipes/70-test_sslrecords.t
index 94aabdc..5a569d3 100644
--- a/test/recipes/70-test_sslrecords.t
+++ b/test/recipes/70-test_sslrecords.t
@@ -23,8 +23,8 @@ plan skip_all => "$test_name needs the dynamic engine feature enabled"
 plan skip_all => "$test_name needs the sock feature enabled"
     if disabled("sock");
 
-plan skip_all => "$test_name needs TLS enabled"
-    if alldisabled(available_protocols("tls"));
+plan skip_all => "$test_name needs TLSv1.2 enabled"
+    if disabled("tls1_2");
 
 $ENV{OPENSSL_ia32cap} = '~0x200000200000000';
 my $proxy = TLSProxy::Proxy->new(
diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 6867cc3..1010665 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -26,9 +26,8 @@ map { s/;.*// } @conf_srcs if $^O eq "VMS";
 my @conf_files = map { basename($_) } @conf_srcs;
 map { s/\.in// } @conf_files;
 
-# 02-protocol-version.conf test and 05-dtls-protocol-version.conf results
-# depend on the configuration of enabled protocols. We only verify generated
-# sources in the default configuration.
+# Some test results depend on the configuration of enabled protocols. We only
+# verify generated sources in the default configuration.
 my $is_default_tls = (disabled("ssl3") && !disabled("tls1") &&
                       !disabled("tls1_1") && !disabled("tls1_2"));
 
@@ -41,16 +40,17 @@ my $no_npn = disabled("nextprotoneg");
 my %conf_dependent_tests = (
   "02-protocol-version.conf" => !$is_default_tls,
   "04-client_auth.conf" => !$is_default_tls,
-  "05-dtls-protocol-version.conf" => !$is_default_dtls,
+  "07-dtls-protocol-version.conf" => !$is_default_dtls,
   "10-resumption.conf" => !$is_default_tls,
   "11-dtls_resumption.conf" => !$is_default_dtls,
 );
 
 # Default is $no_tls but some tests have different skip conditions.
 my %skip = (
-  "05-dtls-protocol-version.conf" => $no_dtls,
+  "07-dtls-protocol-version.conf" => $no_dtls,
   "08-npn.conf" => $no_tls || $no_npn,
-  "11-dtls_resumption.conf" => $no_dtls,
+  "10-resumption.conf" => disabled("tls1_1") || disabled("tls1_2"),
+  "11-dtls_resumption.conf" => disabled("dtls1") || disabled("dtls1_2"),
 );
 
 foreach my $conf (@conf_files) {
diff --git a/test/sslapitest.c b/test/sslapitest.c
index 8a361c1..d36a792 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -242,7 +242,7 @@ static int execute_test_session(SSL_SESSION_TEST_FIXTURE fix)
         goto end;
     }
 
-#ifndef OPENSSL_NO_TLS1_1
+#if !defined(OPENSSL_NO_TLS1_1) && !defined(OPENSSL_NO_TLS1_2)
     /* Force a connection failure */
     SSL_CTX_set_max_proto_version(sctx, TLS1_1_VERSION);
     clientssl3 = SSL_new(cctx);