[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  4d118fe007692de2dd8c5dd084254f8d3b308167 (commit)
       via  e9ee653671b52327d608642662d83f91665d1167 (commit)
      from  c5055adf35772384ebc59e251acfc5276d4a153a (commit)


- Log -----------------------------------------------------------------
commit 4d118fe007692de2dd8c5dd084254f8d3b308167
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)

commit e9ee653671b52327d608642662d83f91665d1167
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Feb 28 15:53:35 2017 +0000

    Fix sslapitest when compiled with no-tls1_2
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2788)

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

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 +++++++-
 test/sslapitest.c                          | 4 ++++
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/test/recipes/80-test_ssl_new.t b/test/recipes/80-test_ssl_new.t
index 8006e5f..f94a7d8 100644
--- a/test/recipes/80-test_ssl_new.t
+++ b/test/recipes/80-test_ssl_new.t
@@ -59,6 +59,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"),
   "19-mac-then-encrypt.conf" => !$is_default_tls,
   "20-cert-select.conf" => !$is_default_tls || $no_dh || $no_dsa,
 );
diff --git a/test/ssl-tests/17-renegotiate.conf.in b/test/ssl-tests/17-renegotiate.conf.in
index 1efba84..867a4f2 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;
 
 our @tests = (
     {
@@ -106,7 +107,9 @@ our @tests = (
             "ResumptionExpected" => "No",
             "ExpectedResult" => "Success"
         }
-    },
+    }
+);
+our @tests_tls1_2 = (
     {
         name => "renegotiate-aead-to-non-aead",
         server => {
@@ -182,5 +185,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 c7020f0..7a65a85 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;
 
 our @tests = (
     {
@@ -92,7 +93,9 @@ our @tests = (
             "ResumptionExpected" => "No",
             "ExpectedResult" => "Success"
         }
-    },
+    }
+);
+our @tests_dtls1_2 = (
     {
         name => "renegotiate-aead-to-non-aead",
         server => {
@@ -166,3 +169,6 @@ our @tests = (
         }
     },
 );
+
+
+push @tests, @tests_dtls1_2 unless disabled("dtls1_2");
diff --git a/test/sslapitest.c b/test/sslapitest.c
index f492e0b..4b5e8c0 100644
--- a/test/sslapitest.c
+++ b/test/sslapitest.c
@@ -477,6 +477,7 @@ end:
 }
 #endif
 
+#ifndef OPENSSL_NO_TLS1_2
 static int full_early_callback(SSL *s, int *al, void *arg)
 {
     int *ctr = arg;
@@ -559,6 +560,7 @@ end:
 
     return testresult;
 }
+#endif
 
 static int execute_test_large_message(const SSL_METHOD *smeth,
                                       const SSL_METHOD *cmeth, int read_ahead)
@@ -1568,7 +1570,9 @@ int test_main(int argc, char *argv[])
 #ifndef OPENSSL_NO_TLS1_3
     ADD_TEST(test_keylog_no_master_key);
 #endif
+#ifndef OPENSSL_NO_TLS1_2
     ADD_TEST(test_early_cb);
+#endif
 
     testresult = run_tests(argv[0]);