Commit db919b1e authored by Matt Caswell's avatar Matt Caswell
Browse files

Update the tests for SNI changes 



If there is no SNI in the session then s_client no longer sends the SNI
extension. Update the tests to take account of that

Reviewed-by: default avatarBen Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3926)
parent c5de99a2

test/recipes/70-test_sslmessages.t

+2 −1
Original line number Diff line number Diff line
@@ -164,7 +164,8 @@ $proxy->clientflags("-no_tls1_3 -sess_in ".$session); 
$proxy->clientstart();

checkhandshake($proxy, checkhandshake::RESUME_HANDSHAKE,

               checkhandshake::DEFAULT_EXTENSIONS

               & ~checkhandshake::SESSION_TICKET_SRV_EXTENSION,

               & ~checkhandshake::SESSION_TICKET_SRV_EXTENSION

               & ~checkhandshake::SERVER_NAME_CLI_EXTENSION,

               "Resumption handshake test");

unlink $session;

test/recipes/70-test_tls13kexmodes.t

+1 −0
Original line number Diff line number Diff line
@@ -143,6 +143,7 @@ my $proxy = TLSProxy::Proxy->new( 
#Test 1: First get a session

(undef, my $session) = tempfile();

$proxy->clientflags("-sess_out ".$session);

$proxy->serverflags("-servername localhost");

$proxy->sessionfile($session);

$proxy->start() or plan skip_all => "Unable to start up Proxy for tests";

plan tests => 11;

test/recipes/70-test_tls13messages.t

+9 −7
Original line number Diff line number Diff line
@@ -157,9 +157,10 @@ $proxy->clearClient(); 
$proxy->clientflags("-sess_in ".$session);

$proxy->clientstart();

checkhandshake($proxy, checkhandshake::RESUME_HANDSHAKE,

               checkhandshake::DEFAULT_EXTENSIONS

               (checkhandshake::DEFAULT_EXTENSIONS

                | checkhandshake::PSK_CLI_EXTENSION

               | checkhandshake::PSK_SRV_EXTENSION,

                | checkhandshake::PSK_SRV_EXTENSION)

               & ~checkhandshake::SERVER_NAME_CLI_EXTENSION,

               "Resumption handshake test");



#Test 3: A status_request handshake (client request only)
@@ -300,10 +301,11 @@ $proxy->clientflags("-sess_in ".$session); 
$proxy->serverflags("-curves P-256");

$proxy->start();

checkhandshake($proxy, checkhandshake::HRR_RESUME_HANDSHAKE,

               checkhandshake::DEFAULT_EXTENSIONS

               (checkhandshake::DEFAULT_EXTENSIONS

                | checkhandshake::KEY_SHARE_HRR_EXTENSION

                | checkhandshake::PSK_CLI_EXTENSION

               | checkhandshake::PSK_SRV_EXTENSION,

                | checkhandshake::PSK_SRV_EXTENSION)

               & ~checkhandshake::SERVER_NAME_CLI_EXTENSION,

               "Resumption handshake with HRR test");



#Test 16: Acceptable but non preferred key_share

test/recipes/70-test_tls13psk.t

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ use constant { 
#Test 1: First get a session

(undef, my $session) = tempfile();

$proxy->clientflags("-sess_out ".$session);

$proxy->serverflags("-servername localhost");

$proxy->sessionfile($session);

$proxy->start() or plan skip_all => "Unable to start up Proxy for tests";

plan tests => 5;