eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework NewSessionTicket handling in state machine

Browse source 
Fixes bug: NewSessionTicket was ommited in resumed sessions.
This commit is contained in:
Manuel Pégourié-Gonnard 2013-08-02 13:24:41 +02:00 • committed by Paul Bakker
parent 3ffa3db80b
commit 7cd5924cec
3 changed files with 13 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

14
library/ssl_cli.c
View file

@ -1967,10 +1967,11 @@ static int ssl_parse_new_session_ticket( ssl_context *ssl )
return( POLARSSL_ERR_SSL_BAD_HS_NEW_SESSION_TICKET );
}
ssl->state = SSL_SERVER_CHANGE_CIPHER_SPEC;
SSL_DEBUG_MSG( 3, ( "ticket length: %d", ticket_len ) );
/* We're not waiting for a NewSessionTicket message any more */
ssl->handshake->new_session_ticket = 0;
/*
* Zero-length ticket means the server changed his mind and doesn't want
* to send a ticket after all, so just forget it
@ -2094,12 +2095,11 @@ int ssl_handshake_client_step( ssl_context *ssl )
* ChangeCipherSpec
* Finished
*/
case SSL_SERVER_NEW_SESSION_TICKET:
ret = ssl_parse_new_session_ticket( ssl );
break;
case SSL_SERVER_CHANGE_CIPHER_SPEC:
ret = ssl_parse_change_cipher_spec( ssl );
if( ssl->handshake->new_session_ticket != 0 )
ret = ssl_parse_new_session_ticket( ssl );
else
ret = ssl_parse_change_cipher_spec( ssl );
break;
case SSL_SERVER_FINISHED: