diff options
author | Matt Caswell <matt@openssl.org> | 2017-08-01 15:46:29 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2017-08-31 15:02:58 +0100 |
commit | db919b1e255fefb7cde711899709ac0e0e8d7734 (patch) | |
tree | c33e0e9561ff1c5cd586ad99f8b030fa74335ab5 /test/recipes/70-test_tls13messages.t | |
parent | c5de99a2d90b0714eeda4943444e3a6bfbc525ad (diff) | |
download | openssl-new-db919b1e255fefb7cde711899709ac0e0e8d7734.tar.gz |
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: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3926)
Diffstat (limited to 'test/recipes/70-test_tls13messages.t')
-rw-r--r-- | test/recipes/70-test_tls13messages.t | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/test/recipes/70-test_tls13messages.t b/test/recipes/70-test_tls13messages.t index c21185167f..24ffb80b2e 100644 --- a/test/recipes/70-test_tls13messages.t +++ b/test/recipes/70-test_tls13messages.t @@ -157,9 +157,10 @@ $proxy->clearClient(); $proxy->clientflags("-sess_in ".$session); $proxy->clientstart(); checkhandshake($proxy, checkhandshake::RESUME_HANDSHAKE, - checkhandshake::DEFAULT_EXTENSIONS - | checkhandshake::PSK_CLI_EXTENSION - | checkhandshake::PSK_SRV_EXTENSION, + (checkhandshake::DEFAULT_EXTENSIONS + | checkhandshake::PSK_CLI_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::KEY_SHARE_HRR_EXTENSION - | checkhandshake::PSK_CLI_EXTENSION - | checkhandshake::PSK_SRV_EXTENSION, + (checkhandshake::DEFAULT_EXTENSIONS + | checkhandshake::KEY_SHARE_HRR_EXTENSION + | checkhandshake::PSK_CLI_EXTENSION + | checkhandshake::PSK_SRV_EXTENSION) + & ~checkhandshake::SERVER_NAME_CLI_EXTENSION, "Resumption handshake with HRR test"); #Test 16: Acceptable but non preferred key_share |