yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

No memmove: ssl_parse_finished()

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-09-10 12:02:46 +00:00 committed by Paul Bakker
parent f899583f94
commit 4abc32734e
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/ssl_tls.c
View file

@ -3791,8 +3791,6 @@ int ssl_parse_finished( ssl_context *ssl )
return( ret ); return( ret );
} }
ssl_hs_rm_dtls_hdr( ssl );
if( ssl->in_msgtype != SSL_MSG_HANDSHAKE ) if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
{ {
SSL_DEBUG_MSG( 1, ( "bad finished message" ) ); SSL_DEBUG_MSG( 1, ( "bad finished message" ) );
@ -3803,13 +3801,14 @@ int ssl_parse_finished( ssl_context *ssl )
hash_len = ( ssl->minor_ver == SSL_MINOR_VERSION_0 ) ? 36 : 12; hash_len = ( ssl->minor_ver == SSL_MINOR_VERSION_0 ) ? 36 : 12;
if( ssl->in_msg[0] != SSL_HS_FINISHED || if( ssl->in_msg[0] != SSL_HS_FINISHED ||
ssl->in_hslen != 4 + hash_len ) ssl->in_hslen != ssl_hs_hdr_len( ssl ) + hash_len )
{ {
SSL_DEBUG_MSG( 1, ( "bad finished message" ) ); SSL_DEBUG_MSG( 1, ( "bad finished message" ) );
return( POLARSSL_ERR_SSL_BAD_HS_FINISHED ); return( POLARSSL_ERR_SSL_BAD_HS_FINISHED );
} }
if( safer_memcmp( ssl->in_msg + 4, buf, hash_len ) != 0 ) if( safer_memcmp( ssl->in_msg + ssl_hs_hdr_len( ssl ),
buf, hash_len ) != 0 )
{ {
SSL_DEBUG_MSG( 1, ( "bad finished message" ) ); SSL_DEBUG_MSG( 1, ( "bad finished message" ) );
return( POLARSSL_ERR_SSL_BAD_HS_FINISHED ); return( POLARSSL_ERR_SSL_BAD_HS_FINISHED );