From 4d118fe007692de2dd8c5dd084254f8d3b308167 Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Tue, 28 Feb 2017 15:53:55 +0000
Subject: [PATCH] Fix test_ssl_new when compiled with no-tls1_2 or no-dtls1_2
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2788)
---
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 8006e5fe07..f94a7d84f8 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 1efba84e50..867a4f2220 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 c7020f0a6b..7a65a85618 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");