QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-05-05 14:09:41 +00:00
Code Issues Projects Releases Wiki Activity

Issue a CCS from the client if we received an HRR

Browse Source 
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4701)
This commit is contained in:
Matt Caswell 2017-11-30 14:33:22 +00:00
parent 75259b4346
commit 318d3c0e62
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ssl/statem/statem_clnt.c
View File

@ -498,8 +498,16 @@ WRITE_TRAN ossl_statem_client_write_transition(SSL *s)
return WRITE_TRAN_FINISHED; return WRITE_TRAN_FINISHED;
case TLS_ST_CR_SRVR_HELLO: case TLS_ST_CR_SRVR_HELLO:
/* We only get here in TLSv1.3 */ /*
st->hand_state = TLS_ST_CW_CLNT_HELLO; * We only get here in TLSv1.3. We just received an HRR, so issue a
* CCS unless middlebox compat mode is off, or we already issued one
* because we did early data.
*/
if ((s->options & SSL_OP_ENABLE_MIDDLEBOX_COMPAT) != 0
&& s->early_data_state != SSL_EARLY_DATA_FINISHED_WRITING)
st->hand_state = TLS_ST_CW_CHANGE;
else
st->hand_state = TLS_ST_CW_CLNT_HELLO;
return WRITE_TRAN_CONTINUE; return WRITE_TRAN_CONTINUE;
case TLS_ST_EARLY_DATA: case TLS_ST_EARLY_DATA:
@ -546,7 +554,9 @@ WRITE_TRAN ossl_statem_client_write_transition(SSL *s)
return WRITE_TRAN_CONTINUE; return WRITE_TRAN_CONTINUE;
case TLS_ST_CW_CHANGE: case TLS_ST_CW_CHANGE:
if (s->early_data_state == SSL_EARLY_DATA_CONNECTING) { if (s->hello_retry_request == SSL_HRR_PENDING) {
st->hand_state = TLS_ST_CW_CLNT_HELLO;
} else if (s->early_data_state == SSL_EARLY_DATA_CONNECTING) {
st->hand_state = TLS_ST_EARLY_DATA; st->hand_state = TLS_ST_EARLY_DATA;
} else { } else {
#if defined(OPENSSL_NO_NEXTPROTONEG) #if defined(OPENSSL_NO_NEXTPROTONEG)
@ -723,7 +733,7 @@ WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst)
break; break;
case TLS_ST_CW_CHANGE: case TLS_ST_CW_CHANGE:
if (SSL_IS_TLS13(s)) if (SSL_IS_TLS13(s) || s->hello_retry_request == SSL_HRR_PENDING)
break; break;
if (s->early_data_state == SSL_EARLY_DATA_CONNECTING if (s->early_data_state == SSL_EARLY_DATA_CONNECTING
&& s->max_early_data > 0) { && s->max_early_data > 0) {