yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-29 08:04:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix server session ID handling with ticket

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2013-08-02 11:59:05 +02:00 committed by Paul Bakker
parent 72882b2079
commit 3ffa3db80b
1 changed files with 49 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
library/ssl_srv.c
View File

@ -439,10 +439,16 @@ static int ssl_parse_session_ticket_ext( ssl_context *ssl,
/* Remember the client asked us to send a ticket */ /* Remember the client asked us to send a ticket */
ssl->handshake->new_session_ticket = 1; ssl->handshake->new_session_ticket = 1;
SSL_DEBUG_MSG( 3, ( "ticket length: %d", len ) );
if( len == 0 ) if( len == 0 )
return( 0 ); return( 0 );
SSL_DEBUG_MSG( 3, ( "ticket length: %d", len ) ); if( ssl->renegotiation != SSL_INITIAL_HANDSHAKE )
{
SSL_DEBUG_MSG( 3, ( "ticket rejected: renegotiating" ) );
return( 0 );
}
/* /*
* Use a temporary session to preserve the current one of failures. * Use a temporary session to preserve the current one of failures.
@ -456,6 +462,13 @@ static int ssl_parse_session_ticket_ext( ssl_context *ssl,
SSL_DEBUG_MSG( 3, ( "session successfully restored from ticket" ) ); SSL_DEBUG_MSG( 3, ( "session successfully restored from ticket" ) );
/*
* Keep the session ID sent by the client, since we MUST send it back to
* inform him we're accepting the ticket (RFC 5077 section 3.4)
*/
session.length = ssl->session_negotiate->length;
memcpy( &session.id, ssl->session_negotiate->id, session.length );
ssl_session_free( ssl->session_negotiate ); ssl_session_free( ssl->session_negotiate );
memcpy( ssl->session_negotiate, &session, sizeof( ssl_session ) ); memcpy( ssl->session_negotiate, &session, sizeof( ssl_session ) );
memset( &session, 0, sizeof( ssl_session ) ); memset( &session, 0, sizeof( ssl_session ) );
@ -1284,36 +1297,44 @@ static int ssl_write_server_hello( ssl_context *ssl )
SSL_DEBUG_BUF( 3, "server hello, random bytes", buf + 6, 32 ); SSL_DEBUG_BUF( 3, "server hello, random bytes", buf + 6, 32 );
/* /*
* 38 . 38 session id length * Resume is 0 by default, see ssl_handshake_init().
* 39 . 38+n session id * It may be already set to 1 by ssl_parse_session_ticket_ext().
* 39+n . 40+n chosen ciphersuite * If not, try looking up session ID in our cache.
* 41+n . 41+n chosen compression alg.
* 42+n . 43+n extensions length
* 44+n . 43+n+m extensions
*/ */
ssl->session_negotiate->length = n = 32; if( ssl->handshake->resume == 0 &&
*p++ = (unsigned char) ssl->session_negotiate->length; ssl->renegotiation == SSL_INITIAL_HANDSHAKE &&
ssl->f_get_cache != NULL &&
ssl->f_get_cache( ssl->p_get_cache, ssl->session_negotiate ) == 0 )
{
ssl->handshake->resume = 1;
}
if( ssl->renegotiation != SSL_INITIAL_HANDSHAKE || if( ssl->handshake->resume == 0 )
ssl->f_get_cache == NULL ||
ssl->f_get_cache( ssl->p_get_cache, ssl->session_negotiate ) != 0 )
{ {
/* /*
* Not found, create a new session id * New session, create a new session id,
* unless we're about to issue a session ticket
*/ */
ssl->handshake->resume = 0;
ssl->state++; ssl->state++;
if( ( ret = ssl->f_rng( ssl->p_rng, ssl->session_negotiate->id, if( ssl->handshake->new_session_ticket == 0 )
n ) ) != 0 ) {
return( ret ); ssl->session_negotiate->length = n = 32;
if( ( ret = ssl->f_rng( ssl->p_rng, ssl->session_negotiate->id,
n ) ) != 0 )
return( ret );
}
else
{
ssl->session_negotiate->length = 0;
memset( ssl->session_negotiate->id, 0, 32 );
}
} }
else else
{ {
/* /*
* Found a matching session, resuming it * Resuming a session
*/ */
ssl->handshake->resume = 1;
ssl->state = SSL_SERVER_CHANGE_CIPHER_SPEC; ssl->state = SSL_SERVER_CHANGE_CIPHER_SPEC;
if( ( ret = ssl_derive_keys( ssl ) ) != 0 ) if( ( ret = ssl_derive_keys( ssl ) ) != 0 )
@ -1323,6 +1344,15 @@ static int ssl_write_server_hello( ssl_context *ssl )
} }
} }
/*
* 38 . 38 session id length
* 39 . 38+n session id
* 39+n . 40+n chosen ciphersuite
* 41+n . 41+n chosen compression alg.
* 42+n . 43+n extensions length
* 44+n . 43+n+m extensions
*/
*p++ = (unsigned char) ssl->session_negotiate->length;
memcpy( p, ssl->session_negotiate->id, ssl->session_negotiate->length ); memcpy( p, ssl->session_negotiate->id, ssl->session_negotiate->length );
p += ssl->session_negotiate->length; p += ssl->session_negotiate->length;