mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-24 13:55:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add a test for early_data when an HRR occurs

Browse Source 
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3933)
This commit is contained in:
Matt Caswell 2017-07-14 12:23:56 +01:00
parent d4504fe579
commit 6b84e6bf19
1 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
test/sslapitest.c
View File

@ -1536,10 +1536,10 @@ static int test_early_data_read_write(int idx)
}
/*
* Test that a server attempting to read early data can handle a connection
* from a client where the early data is not acceptable.
* Helper function to test that a server attempting to read early data can
* handle a connection from a client where the early data should be skipped.
*/
static int test_early_data_skip(int idx)
static int early_data_skip_helper(int hrr, int idx)
{
SSL_CTX *cctx = NULL, *sctx = NULL;
SSL *clientssl = NULL, *serverssl = NULL;
@ -1552,13 +1552,19 @@ static int test_early_data_skip(int idx)
&serverssl, &sess, idx)))
goto end;
/*
* Deliberately corrupt the creation time. We take 20 seconds off the time.
* It could be any value as long as it is not within tolerance. This should
* mean the ticket is rejected.
*/
if (!TEST_true(SSL_SESSION_set_time(sess, time(NULL) - 20)))
goto end;
if (hrr) {
/* Force an HRR to occur */
if (!TEST_true(SSL_set1_groups_list(serverssl, "P-256")))
goto end;
} else {
/*
* Deliberately corrupt the creation time. We take 20 seconds off the
* time. It could be any value as long as it is not within tolerance.
* This should mean the ticket is rejected.
*/
if (!TEST_true(SSL_SESSION_set_time(sess, time(NULL) - 20)))
goto end;
}
/* Write some early data */
if (!TEST_true(SSL_write_early_data(clientssl, MSG1, strlen(MSG1),
@ -1575,6 +1581,18 @@ static int test_early_data_skip(int idx)
SSL_EARLY_DATA_REJECTED))
goto end;
if (hrr) {
/*
* Finish off the handshake. We perform the same writes and reads as
* further down but we expect them to fail due to the incomplete
* handshake.
*/
if (!TEST_false(SSL_write_ex(clientssl, MSG2, strlen(MSG2), &written))
|| !TEST_false(SSL_read_ex(serverssl, buf, sizeof(buf),
&readbytes)))
goto end;
}
/* Should be able to send normal data despite rejection of early data */
if (!TEST_true(SSL_write_ex(clientssl, MSG2, strlen(MSG2), &written))
|| !TEST_size_t_eq(written, strlen(MSG2))
@ -1595,6 +1613,24 @@ static int test_early_data_skip(int idx)
return testresult;
}
/*
* Test that a server attempting to read early data can handle a connection
* from a client where the early data is not acceptable.
*/
static int test_early_data_skip(int idx)
{
return early_data_skip_helper(0, idx);
}
/*
* Test that a server attempting to read early data can handle a connection
* from a client where an HRR occurs.
*/
static int test_early_data_skip_hrr(int idx)
{
return early_data_skip_helper(1, idx);
}
/*
* Test that a server attempting to read early data can handle a connection
* from a client that doesn't send any.
@ -2652,6 +2688,7 @@ int test_main(int argc, char *argv[])
#ifndef OPENSSL_NO_TLS1_3
ADD_ALL_TESTS(test_early_data_read_write, 2);
ADD_ALL_TESTS(test_early_data_skip, 2);
ADD_ALL_TESTS(test_early_data_skip_hrr, 2);
ADD_ALL_TESTS(test_early_data_not_sent, 2);
ADD_ALL_TESTS(test_early_data_not_expected, 2);
# ifndef OPENSSL_NO_TLS1_2