diff options
author | Matt Caswell <matt@openssl.org> | 2018-05-23 12:11:15 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2018-06-27 10:03:20 +0100 |
commit | c748834ff7af7949519d2820a79ec35e809b5a71 (patch) | |
tree | dbc29e23d2a6a10cc81b511e3401a07a91162893 /test/ssltestlib.c | |
parent | 93f528f36eb9423c31b2d75669cea85da97f9633 (diff) | |
download | openssl-c748834ff7af7949519d2820a79ec35e809b5a71.zip openssl-c748834ff7af7949519d2820a79ec35e809b5a71.tar.gz openssl-c748834ff7af7949519d2820a79ec35e809b5a71.tar.bz2 |
Add a bi-directional shutdown test
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from https://github.com/openssl/openssl/pull/6340)
Diffstat (limited to 'test/ssltestlib.c')
-rw-r--r-- | test/ssltestlib.c | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/test/ssltestlib.c b/test/ssltestlib.c index 2ef4b5d..a055d3b 100644 --- a/test/ssltestlib.c +++ b/test/ssltestlib.c @@ -680,12 +680,14 @@ int create_ssl_objects(SSL_CTX *serverctx, SSL_CTX *clientctx, SSL **sssl, return 0; } -int create_ssl_connection(SSL *serverssl, SSL *clientssl, int want) +/* + * Create an SSL connection, but does not ready any post-handshake + * NewSessionTicket messages. + */ +int create_bare_ssl_connection(SSL *serverssl, SSL *clientssl, int want) { - int retc = -1, rets = -1, err, abortctr = 0, i; + int retc = -1, rets = -1, err, abortctr = 0; int clienterr = 0, servererr = 0; - unsigned char buf; - size_t readbytes; int isdtls = SSL_is_dtls(serverssl); do { @@ -738,6 +740,22 @@ int create_ssl_connection(SSL *serverssl, SSL *clientssl, int want) } } while (retc <=0 || rets <= 0); + return 1; +} + +/* + * Create an SSL connection including any post handshake NewSessionTicket + * messages. + */ +int create_ssl_connection(SSL *serverssl, SSL *clientssl, int want) +{ + int i; + unsigned char buf; + size_t readbytes; + + if (!create_bare_ssl_connection(serverssl, clientssl, want)) + return 0; + /* * We attempt to read some data on the client side which we expect to fail. * This will ensure we have received the NewSessionTicket in TLSv1.3 where |