summaryrefslogtreecommitdiffstats
path: root/test/handshake_helper.c
diff options
context:
space:
mode:
authorEmilia Kasper <emilia@openssl.org>2016-07-21 14:04:00 +0200
committerEmilia Kasper <emilia@openssl.org>2016-07-21 15:44:36 +0200
commit11279b13f586441a8fcc5109ee1907f33eb0cc24 (patch)
tree9dbd063fa7147e9854aeba640f9d7dff859b11bb /test/handshake_helper.c
parent2980ae2e78169b3b4d0b140c0c5796c441c5902c (diff)
Test client-side resumption
Add tests for resuming with a different client version. This happens in reality when clients persist sessions on disk through upgrades. Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'test/handshake_helper.c')
-rw-r--r--test/handshake_helper.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/handshake_helper.c b/test/handshake_helper.c
index c4f298e945..eecc6f762c 100644
--- a/test/handshake_helper.c
+++ b/test/handshake_helper.c
@@ -673,6 +673,7 @@ static HANDSHAKE_RESULT *do_handshake_internal(
HANDSHAKE_RESULT *do_handshake(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
SSL_CTX *client_ctx, SSL_CTX *resume_server_ctx,
+ SSL_CTX *resume_client_ctx,
const SSL_TEST_CTX *test_ctx)
{
HANDSHAKE_RESULT *result;
@@ -692,8 +693,8 @@ HANDSHAKE_RESULT *do_handshake(SSL_CTX *server_ctx, SSL_CTX *server2_ctx,
HANDSHAKE_RESULT_free(result);
/* We don't support SNI on second handshake yet, so server2_ctx is NULL. */
- result = do_handshake_internal(resume_server_ctx, NULL, client_ctx, test_ctx,
- session, NULL);
+ result = do_handshake_internal(resume_server_ctx, NULL, resume_client_ctx,
+ test_ctx, session, NULL);
end:
SSL_SESSION_free(session);
return result;