From 4ba808de916c9390d45d733563313d8d8f8dbe44 Mon Sep 17 00:00:00 2001 From: Matt Caswell 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 (Merged from https://github.com/openssl/openssl/pull/2788) (cherry picked from commit 4d118fe007692de2dd8c5dd084254f8d3b308167) --- 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 5348a73388..2f6a69a305 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 fde57bc083..c919a16f54 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 43046e3a02..f32ab37480 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"); -- 2.25.1