diff options
author | Matt Caswell <matt@openssl.org> | 2017-02-28 15:53:55 +0000 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-02-28 16:26:13 +0000 |
commit | 4d118fe007692de2dd8c5dd084254f8d3b308167 (patch) | |
tree | 5d4d48c6d90c86548d26cb5a29f06123be9693dd /test/ssl-tests | |
parent | e9ee653671b52327d608642662d83f91665d1167 (diff) |
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)
Diffstat (limited to 'test/ssl-tests')
-rw-r--r-- | test/ssl-tests/17-renegotiate.conf.in | 9 | ||||
-rw-r--r-- | test/ssl-tests/18-dtls-renegotiate.conf.in | 8 |
2 files changed, 14 insertions, 3 deletions
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"); |