diff options
Diffstat (limited to 'test')
-rwxr-xr-x | test/recipes/70-test_sslsessiontick.t | 18 | ||||
-rwxr-xr-x | test/recipes/70-test_sslvertol.t | 3 | ||||
-rw-r--r-- | test/recipes/70-test_tlsextms.t | 10 |
3 files changed, 20 insertions, 11 deletions
diff --git a/test/recipes/70-test_sslsessiontick.t b/test/recipes/70-test_sslsessiontick.t index f13c7ba586..56ae4c0cba 100755 --- a/test/recipes/70-test_sslsessiontick.t +++ b/test/recipes/70-test_sslsessiontick.t @@ -71,6 +71,7 @@ $ENV{OPENSSL_ENGINES} = bldtop_dir("engines"); $ENV{OPENSSL_ia32cap} = '~0x200000200000000'; sub checkmessages($$$$$$); +sub clearclient(); sub clearall(); my $chellotickext = 0; @@ -119,7 +120,7 @@ clearall(); $proxy->serverconnects(2); $proxy->clientflags("-sess_out ".$session); $proxy->start(); -$proxy->clear(); +$proxy->clearClient(); $proxy->clientflags("-sess_in ".$session); $proxy->clientstart(); checkmessages(4, "Session resumption session ticket test", 1, 0, 0, 0); @@ -132,7 +133,7 @@ clearall(); $proxy->serverconnects(2); $proxy->clientflags("-sess_out ".$session." -no_ticket"); $proxy->start(); -$proxy->clear(); +$proxy->clearClient(); $proxy->clientflags("-sess_in ".$session); $proxy->clientstart(); checkmessages(5, "Session resumption with ticket capable client without a " @@ -153,14 +154,14 @@ $proxy->serverconnects(3); $proxy->filter(undef); $proxy->clientflags("-sess_out ".$session); $proxy->start(); -$proxy->clear(); +$proxy->clearClient(); $proxy->clientflags("-sess_in ".$session." -sess_out ".$session); $proxy->filter(\&inject_empty_ticket_filter); $proxy->clientstart(); #Expected result: ClientHello extension seen; ServerHello extension seen; # NewSessionTicket message seen; Abbreviated handshake. checkmessages(7, "Empty ticket resumption test", 1, 1, 1, 0); -clearall(); +clearclient(); $proxy->clientflags("-sess_in ".$session); $proxy->filter(undef); $proxy->clientstart(); @@ -252,11 +253,18 @@ sub checkmessages($$$$$$) } } -sub clearall() + +sub clearclient() { $chellotickext = 0; $shellotickext = 0; $fullhand = 0; $ticketseen = 0; + $proxy->clearClient(); +} + +sub clearall() +{ + clearclient(); $proxy->clear(); } diff --git a/test/recipes/70-test_sslvertol.t b/test/recipes/70-test_sslvertol.t index a35eab960b..d436b5aba7 100755 --- a/test/recipes/70-test_sslvertol.t +++ b/test/recipes/70-test_sslvertol.t @@ -84,7 +84,8 @@ ok(TLSProxy::Message->success(), "Version tolerance test, TLS 1.3"); #Test 2: Testing something below SSLv3 should fail $client_version = TLSProxy::Record::VERS_SSL_3_0 - 1; -$proxy->restart(); +$proxy->clear(); +$proxy->start(); ok(TLSProxy::Message->fail(), "Version tolerance test, SSL < 3.0"); sub vers_tolerance_filter diff --git a/test/recipes/70-test_tlsextms.t b/test/recipes/70-test_tlsextms.t index 06b4d9ee3f..47a03213c8 100644 --- a/test/recipes/70-test_tlsextms.t +++ b/test/recipes/70-test_tlsextms.t @@ -136,7 +136,7 @@ setrmextms(0, 0); $proxy->serverconnects(2); $proxy->clientflags("-sess_out ".$session); $proxy->start(); -$proxy->clear(); +$proxy->clearClient(); $proxy->clientflags("-sess_in ".$session); $proxy->clientstart(); checkmessages(5, "Session resumption extended master secret test", 1, 1, 0); @@ -152,7 +152,7 @@ setrmextms(1, 0); $proxy->serverconnects(2); $proxy->clientflags("-sess_out ".$session); $proxy->start(); -$proxy->clear(); +$proxy->clearClient(); $proxy->clientflags("-sess_in ".$session); setrmextms(0, 0); $proxy->clientstart(); @@ -168,7 +168,7 @@ setrmextms(0, 0); $proxy->serverconnects(2); $proxy->clientflags("-sess_out ".$session); $proxy->start(); -$proxy->clear(); +$proxy->clearClient(); $proxy->clientflags("-sess_in ".$session); setrmextms(1, 0); $proxy->clientstart(); @@ -184,7 +184,7 @@ setrmextms(0, 0); $proxy->serverconnects(2); $proxy->clientflags("-sess_out ".$session); $proxy->start(); -$proxy->clear(); +$proxy->clearClient(); $proxy->clientflags("-sess_in ".$session); setrmextms(0, 1); $proxy->clientstart(); @@ -200,7 +200,7 @@ setrmextms(0, 1); $proxy->serverconnects(2); $proxy->clientflags("-sess_out ".$session); $proxy->start(); -$proxy->clear(); +$proxy->clearClient(); $proxy->clientflags("-sess_in ".$session); setrmextms(0, 0); $proxy->clientstart(); |