mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-19 19:50:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix test_ssl_new when compiled with no-tls1_2 or no-dtls1_2

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2788)
This commit is contained in:
Matt Caswell 2017-02-28 15:53:55 +00:00
parent e9ee653671
commit 4d118fe007
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/recipes/80-test_ssl_new.t
View File

@ -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,
);

9
test/ssl-tests/17-renegotiate.conf.in
View File

@ -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");

8
test/ssl-tests/18-dtls-renegotiate.conf.in
View File

@ -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");