summaryrefslogtreecommitdiffstats
path: root/test/generate_ssl_tests.pl
diff options
context:
space:
mode:
Diffstat (limited to 'test/generate_ssl_tests.pl')
-rw-r--r--test/generate_ssl_tests.pl17
1 files changed, 15 insertions, 2 deletions
diff --git a/test/generate_ssl_tests.pl b/test/generate_ssl_tests.pl
index 7a016d1fd9..a2f4714587 100644
--- a/test/generate_ssl_tests.pl
+++ b/test/generate_ssl_tests.pl
@@ -43,12 +43,25 @@ sub print_templates {
# Add the implicit base configuration.
foreach my $test (@ssltests::tests) {
$test->{"server"} = { (%ssltests::base_server, %{$test->{"server"}}) };
- # Do not emit an empty "server2" section.
- if (defined $test->{"server2"}) {
+ if (defined $test->{"server2"}) {
$test->{"server2"} = { (%ssltests::base_server, %{$test->{"server2"}}) };
+ } elsif (defined $test->{"test"}->{"ServerNameCallback"}) {
+ # Default is the same as server.
+ $test->{"server2"} = { (%ssltests::base_server, %{$test->{"server"}}) };
} else {
+ # Do not emit an empty "server2" section.
$test->{"server2"} = { };
}
+ if (defined $test->{"resume_server"}) {
+ $test->{"resume_server"} = { (%ssltests::base_server, %{$test->{"resume_server"}}) };
+ } elsif (defined $test->{"test"}->{"HandshakeMode"} &&
+ $test->{"test"}->{"HandshakeMode"} eq "Resume") {
+ # Default is the same as server.
+ $test->{"resume_server"} = { (%ssltests::base_server, %{$test->{"server"}}) };
+ } else {
+ # Do not emit an empty "resume-server" section.
+ $test->{"resume_server"} = { };
+ }
$test->{"client"} = { (%ssltests::base_client, %{$test->{"client"}}) };
}