#! /usr/bin/env perl
# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
#
-# Licensed under the OpenSSL license (the "License"). You may not use
+# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
# in the file LICENSE in the source distribution or at
# https://www.openssl.org/source/license.html
OpenSSL::Test::setup("no_test_here");
}
-use lib srctop_dir("util"); # for with_fallback
+use lib srctop_dir("util", "perl"); # for with_fallback
use lib srctop_dir("test", "ssl-tests"); # for ssltests_base
use with_fallback qw(Text::Template);
$test->{"server"} = { (%ssltests::base_server, %{$test->{"server"}}) };
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.
+ if ($test->{"server"}->{"extra"} &&
+ defined $test->{"server"}->{"extra"}->{"ServerNameCallback"}) {
+ # Default is the same as server.
+ $test->{"reuse_server2"} = 1;
+ }
+ # Do not emit an empty/duplicate "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.
+ if (defined $test->{"test"}->{"HandshakeMode"} &&
+ $test->{"test"}->{"HandshakeMode"} eq "Resume") {
+ # Default is the same as server.
+ $test->{"reuse_resume_server"} = 1;
+ }
+ # Do not emit an empty/duplicate "resume-server" section.
$test->{"resume_server"} = { };
}
$test->{"client"} = { (%ssltests::base_client, %{$test->{"client"}}) };
if (defined $test->{"resume_client"}) {
$test->{"resume_client"} = { (%ssltests::base_client, %{$test->{"resume_client"}}) };
- } elsif (defined $test->{"test"}->{"HandshakeMode"} &&
- $test->{"test"}->{"HandshakeMode"} eq "Resume") {
- # Default is the same as client.
- $test->{"resume_client"} = { (%ssltests::base_client, %{$test->{"client"}}) };
} else {
- # Do not emit an empty "resume-client" section.
+ if (defined $test->{"test"}->{"HandshakeMode"} &&
+ $test->{"test"}->{"HandshakeMode"} eq "Resume") {
+ # Default is the same as client.
+ $test->{"reuse_resume_client"} = 1;
+ }
+ # Do not emit an empty/duplicate "resume-client" section.
$test->{"resume_client"} = { };
}
}