mirror of
https://github.com/openssl/openssl.git
synced 2025-01-24 13:55:42 +08:00
9f48bbacd8
Move custom server and client options from the test dictionary to an "extra" section of each server/client. Rename test expectations to say "Expected". This is a big but straightforward change. Primarily, this allows us to specify multiple server and client contexts without redefining the custom options for each of them. For example, instead of "ServerNPNProtocols", "Server2NPNProtocols", "ResumeServerNPNProtocols", we now have, "NPNProtocols". This simplifies writing resumption and SNI tests. The first application will be resumption tests for NPN and ALPN. Regrouping the options also makes it clearer which options apply to the server, which apply to the client, which configure the test, and which are test expectations. Reviewed-by: Richard Levitte <levitte@openssl.org>
96 lines
2.6 KiB
Perl
96 lines
2.6 KiB
Perl
# -*- mode: perl; -*-
|
|
# Copyright 2016-2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
#
|
|
# Licensed under the OpenSSL license (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
|
|
|
|
|
|
## Test version negotiation
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
package ssltests;
|
|
|
|
|
|
our @tests = ();
|
|
|
|
sub generate_tests() {
|
|
foreach my $c ("SessionTicket", "-SessionTicket") {
|
|
foreach my $s1 ("SessionTicket", "-SessionTicket") {
|
|
foreach my $s2 ("SessionTicket", "-SessionTicket") {
|
|
foreach my $n ("server1", "server2") {
|
|
my $result = expected_result($c, $s1, $s2, $n);
|
|
push @tests, {
|
|
"name" => "sni-session-ticket",
|
|
"client" => {
|
|
"Options" => $c,
|
|
"extra" => {
|
|
"ServerName" => $n,
|
|
},
|
|
},
|
|
"server" => {
|
|
"Options" => $s1,
|
|
"extra" => {
|
|
# We don't test mismatch here.
|
|
"ServerNameCallback" => "IgnoreMismatch",
|
|
},
|
|
},
|
|
"server2" => {
|
|
"Options" => $s2,
|
|
},
|
|
"test" => {
|
|
"ExpectedServerName" => $n,
|
|
"ExpectedResult" => "Success",
|
|
"SessionTicketExpected" => $result,
|
|
}
|
|
};
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
# If the client has session tickets disabled, then No support
|
|
# If the server initial_ctx has session tickets disabled, then No support
|
|
# If SNI is in use, then if the "switched-to" context has session tickets disabled,
|
|
# then No support
|
|
sub expected_result {
|
|
my ($c, $s1, $s2, $n) = @_;
|
|
|
|
return "No" if $c eq "-SessionTicket";
|
|
return "No" if $s1 eq "-SessionTicket";
|
|
return "No" if ($s2 eq "-SessionTicket" && $n eq "server2");
|
|
|
|
return "Yes";
|
|
|
|
}
|
|
|
|
# Add a "Broken" case.
|
|
push @tests, {
|
|
"name" => "sni-session-ticket",
|
|
"client" => {
|
|
"Options" => "SessionTicket",
|
|
"extra" => {
|
|
"ServerName" => "server1",
|
|
}
|
|
},
|
|
"server" => {
|
|
"Options" => "SessionTicket",
|
|
"extra" => {
|
|
"BrokenSessionTicket" => "Yes",
|
|
},
|
|
},
|
|
"server2" => {
|
|
"Options" => "SessionTicket",
|
|
},
|
|
"test" => {
|
|
"ExpectedResult" => "Success",
|
|
"SessionTicketExpected" => "No",
|
|
}
|
|
};
|
|
|
|
generate_tests();
|