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

Prepare moving away from memmove() on incoming HS

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

17
include/polarssl/ssl.h
View file

@ -1974,6 +1974,23 @@ static inline int safer_memcmp( const void *a, const void *b, size_t n )
return( diff );
}
/*
* Temporary function while transitionning away from memmove()
* on received DTLS handshake messages
*/
static inline void ssl_hs_rm_dtls_hdr( ssl_context *ssl )
{
#if defined(POLARSSL_SSL_PROTO_DTLS)
if( ssl->transport == SSL_TRANSPORT_DATAGRAM )
{
memmove( ssl->in_msg + 4, ssl->in_msg + 12, ssl->in_hslen - 12 );
ssl->in_hslen -= 8;
}
#else
(void) ssl;
#endif
}
#ifdef __cplusplus
}
#endif

10
library/ssl_cli.c
View file

@ -1069,6 +1069,8 @@ static int ssl_parse_server_hello( ssl_context *ssl )
return( POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE );
}
ssl_hs_rm_dtls_hdr( ssl );
#if defined(POLARSSL_SSL_PROTO_DTLS)
if( ssl->transport == SSL_TRANSPORT_DATAGRAM )
{
@ -1774,6 +1776,8 @@ static int ssl_parse_server_key_exchange( ssl_context *ssl )
return( ret );
}
ssl_hs_rm_dtls_hdr( ssl );
if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
{
SSL_DEBUG_MSG( 1, ( "bad server key exchange message" ) );
@ -2098,6 +2102,8 @@ static int ssl_parse_certificate_request( ssl_context *ssl )
return( ret );
}
ssl_hs_rm_dtls_hdr( ssl );
if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
{
SSL_DEBUG_MSG( 1, ( "bad certificate request message" ) );
@ -2222,6 +2228,8 @@ static int ssl_parse_server_hello_done( ssl_context *ssl )
return( ret );
}
ssl_hs_rm_dtls_hdr( ssl );
if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
{
SSL_DEBUG_MSG( 1, ( "bad server hello done message" ) );
@ -2648,6 +2656,8 @@ static int ssl_parse_new_session_ticket( ssl_context *ssl )
return( ret );
}
ssl_hs_rm_dtls_hdr( ssl );
if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
{
SSL_DEBUG_MSG( 1, ( "bad new session ticket message" ) );

4
library/ssl_srv.c
View file

@ -3018,6 +3018,8 @@ static int ssl_parse_client_key_exchange( ssl_context *ssl )
return( ret );
}
ssl_hs_rm_dtls_hdr( ssl );
if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
{
SSL_DEBUG_MSG( 1, ( "bad client key exchange message" ) );
@ -3310,6 +3312,8 @@ static int ssl_parse_certificate_verify( ssl_context *ssl )
return( ret );
}
ssl_hs_rm_dtls_hdr( ssl );
ssl->state++;
if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )

34
library/ssl_tls.c
View file

@ -2408,22 +2408,6 @@ static int ssl_prepare_handshake_record( ssl_context *ssl )
}
#endif
/*
* For DTLS, we move data so that is looks like TLS handshake format to
* other functions.
* Except on server after the initial handshake (wait until after
* update_checksum() in ssl_parse_client_hello()).
*/
#if defined(POLARSSL_SSL_PROTO_DTLS)
if( ssl->transport == SSL_TRANSPORT_DATAGRAM &&
! ( ssl->endpoint == SSL_IS_SERVER &&
ssl->state == SSL_HANDSHAKE_OVER ) )
{
memmove( ssl->in_msg + 4, ssl->in_msg + 12, ssl->in_hslen - 12 );
ssl->in_hslen -= 8;
}
#endif /* POLARSSL_SSL_PROTO_DTLS */
return( 0 );
}
@ -2625,16 +2609,8 @@ int ssl_read_record( ssl_context *ssl )
SSL_DEBUG_MSG( 2, ( "=> read record" ) );
/*
* With DTLS, we cheated on in_hslen to make the handshake message look
* like TLS format, restore the truth now
*/
#if defined(POLARSSL_SSL_PROTO_DTLS)
if( ssl->in_hslen != 0 && ssl->transport == SSL_TRANSPORT_DATAGRAM )
ssl->in_hslen += 8;
#endif
if( ssl->in_hslen != 0 && ssl->in_hslen < ssl->in_msglen )
/* Temporarily disabled */
if( ( 0 ) && ssl->in_hslen != 0 && ssl->in_hslen < ssl->in_msglen )
{
/*
* Get next Handshake message in the current record
@ -3001,6 +2977,8 @@ int ssl_parse_certificate( ssl_context *ssl )
return( ret );
}
ssl_hs_rm_dtls_hdr( ssl );
ssl->state++;
#if defined(POLARSSL_SSL_PROTO_SSL3)
@ -3813,6 +3791,8 @@ int ssl_parse_finished( ssl_context *ssl )
return( ret );
}
ssl_hs_rm_dtls_hdr( ssl );
if( ssl->in_msgtype != SSL_MSG_HANDSHAKE )
{
SSL_DEBUG_MSG( 1, ( "bad finished message" ) );
@ -5041,7 +5021,7 @@ int ssl_read( ssl_context *ssl, unsigned char *buf, size_t len )
if( ssl->endpoint == SSL_IS_CLIENT &&
( ssl->in_msg[0] != SSL_HS_HELLO_REQUEST ||
ssl->in_hslen != 4 ) )
ssl->in_hslen != ssl_hs_hdr_len( ssl ) ) )
{
SSL_DEBUG_MSG( 1, ( "handshake received (not HelloRequest)" ) );