mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update early data test for an even later arrival of CF

Browse Source 
Commit 9b5c865df introduced a synthetic delay between arrival of EoED and
CF. We actually want to delay the arrival of CF even further to demonstrate
that we can write early data even when "in init".

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3091)
This commit is contained in:
Matt Caswell 2017-03-30 17:38:15 +01:00
parent 59cebcf9f6
commit f8a303fa7d
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/sslapitest.c
View File

@ -1721,13 +1721,6 @@ static int test_early_data_read_write(int idx)
goto end;
}
/* Push the ClientFinished and the normal data back into the server rbio */
if (!BIO_write_ex(rbio, data + eoedlen, rawread - eoedlen, &rawwritten)
|| rawwritten != rawread - eoedlen) {
printf("Failed to write the ClientFinished and data to server rbio\n");
goto end;
}
/*
* Server has not finished init yet, so should still be able to write early
* data.
@ -1738,6 +1731,13 @@ static int test_early_data_read_write(int idx)
goto end;
}
/* Push the ClientFinished and the normal data back into the server rbio */
if (!BIO_write_ex(rbio, data + eoedlen, rawread - eoedlen, &rawwritten)
|| rawwritten != rawread - eoedlen) {
printf("Failed to write the ClientFinished and data to server rbio\n");
goto end;
}
/* Server should be able to read normal data */
if (!SSL_read_ex(serverssl, buf, sizeof(buf), &readbytes)
|| readbytes != strlen(MSG5)) {
@ -1759,16 +1759,6 @@ static int test_early_data_read_write(int idx)
}
ERR_clear_error();
/*
* Make sure we process the NewSessionTicket. This arrives post-handshake.
* We attempt a read which we do not expect to return any data. Doesn't
* apply when read_ahead is in use - the ticket will get processed along
* with the application data in the second read below.
*/
if (idx == 0 && SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes)) {
printf("Unexpected success doing final client read\n");
goto end;
}
/* Client should be able to read the data sent by the server */
if (!SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes)
|| readbytes != strlen(MSG6)
@ -1776,7 +1766,14 @@ static int test_early_data_read_write(int idx)
printf("Failed reading message 6\n");
goto end;
}
/*
* Make sure we process the NewSessionTicket. This arrives post-handshake.
* We attempt a read which we do not expect to return any data.
*/
if (SSL_read_ex(clientssl, buf, sizeof(buf), &readbytes)) {
printf("Unexpected success doing final client read\n");
goto end;
}
SSL_SESSION_free(sess);
sess = SSL_get1_session(clientssl);