From 05a2feb6841c786b24a104943b2765ef8bc7a61f Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 20 Mar 2017 18:21:54 +0000 Subject: Add a test for resumption after HRR Make sure we actually test resumption where an HRR has occurred. Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2996) (cherry picked from commit 1763ab10291eec361d8e56519582d710158e1e8e) --- test/ssl-tests/protocol_version.pm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/test/ssl-tests/protocol_version.pm b/test/ssl-tests/protocol_version.pm index cc39c757c4..7c28bcf0f6 100644 --- a/test/ssl-tests/protocol_version.pm +++ b/test/ssl-tests/protocol_version.pm @@ -17,7 +17,7 @@ use warnings; use List::Util qw/max min/; use OpenSSL::Test; -use OpenSSL::Test::Utils qw/anydisabled alldisabled/; +use OpenSSL::Test::Utils qw/anydisabled alldisabled disabled/; setup("no_test_here"); my @tls_protocols = ("SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3"); @@ -203,6 +203,25 @@ sub generate_resumption_tests { } } + if (!disabled("tls1_3") && !$dtls) { + push @client_tests, { + "name" => "resumption-with-hrr", + "client" => { + }, + "server" => { + "Curves" => "P-256" + }, + "resume_client" => { + }, + "test" => { + "ExpectedProtocol" => "TLSv1.3", + "Method" => "TLS", + "HandshakeMode" => "Resume", + "ResumptionExpected" => "Yes", + } + }; + } + return (@server_tests, @client_tests); } -- cgit v1.2.3