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

[Matt Caswell]

The branch OpenSSL_1_1_0-stable has been updated
       via  4ba808de916c9390d45d733563313d8d8f8dbe44 (commit)
      from  0ddda824399d0b30057c6a0705ea65bf1985cf48 (commit)


- Log -----------------------------------------------------------------
commit 4ba808de916c9390d45d733563313d8d8f8dbe44
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 28 15:53:55 2017 +0000

    Fix test_ssl_new when compiled with no-tls1_2 or no-dtls1_2
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2788)
    (cherry picked from commit 4d118fe007692de2dd8c5dd084254f8d3b308167)

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

Summary of changes:
 test/recipes/80-test_ssl_new.t             | 2 ++
 test/ssl-tests/17-renegotiate.conf.in      | 9 +++++++--
 test/ssl-tests/18-dtls-renegotiate.conf.in | 8 +++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 5348a73..2f6a69a 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -54,6 +54,8 @@ my %conf_dependent_tests = (
   "07-dtls-protocol-version.conf" => !$is_default_dtls,
   "10-resumption.conf" => !$is_default_tls,
   "11-dtls_resumption.conf" => !$is_default_dtls,
+  "17-renegotiate.conf" => disabled("tls1_2"),
+  "18-dtls-renegotiate.conf" => disabled("dtls1_2"),
 );
 
 # Add your test here if it should be skipped for some compile-time
diff --git a/test/ssl-tests/17-renegotiate.conf.in b/test/ssl-tests/17-renegotiate.conf.in
index fde57bc..c919a16 100644
--- a/test/ssl-tests/17-renegotiate.conf.in
+++ b/test/ssl-tests/17-renegotiate.conf.in
@@ -13,6 +13,7 @@ use strict;
 use warnings;
 
 package ssltests;
+use OpenSSL::Test::Utils;
 
 my $dir_sep = $^O ne "VMS" ? "/" : "";
 
@@ -102,7 +103,9 @@ our @tests = (
             "ResumptionExpected" => "No",
             "ExpectedResult" => "Success"
         }
-    },
+    }
+);
+our @tests_tls1_2 = (
     {
         name => "renegotiate-aead-to-non-aead",
         server => {
@@ -178,5 +181,7 @@ our @tests = (
             "ResumptionExpected" => "No",
             "ExpectedResult" => "Success"
         }
-    },
+    }
 );
+
+push @tests, @tests_tls1_2 unless disabled("tls1_2");
diff --git a/test/ssl-tests/18-dtls-renegotiate.conf.in b/test/ssl-tests/18-dtls-renegotiate.conf.in
index 43046e3..f32ab37 100644
--- a/test/ssl-tests/18-dtls-renegotiate.conf.in
+++ b/test/ssl-tests/18-dtls-renegotiate.conf.in
@@ -13,6 +13,7 @@ use strict;
 use warnings;
 
 package ssltests;
+use OpenSSL::Test::Utils;
 
 my $dir_sep = $^O ne "VMS" ? "/" : "";
 
@@ -94,7 +95,9 @@ our @tests = (
             "ResumptionExpected" => "No",
             "ExpectedResult" => "Success"
         }
-    },
+    }
+);
+our @tests_dtls1_2 = (
     {
         name => "renegotiate-aead-to-non-aead",
         server => {
@@ -168,3 +171,6 @@ our @tests = (
         }
     },
 );
+
+
+push @tests, @tests_dtls1_2 unless disabled("dtls1_2");