No memmove: done, rm temporary things

This commit is contained in:
Manuel Pégourié-Gonnard 2014-09-10 21:56:38 +02:00 committed by Paul Bakker
parent 000d5aec13
commit 624bcb5260
2 changed files with 1 additions and 19 deletions

View file

@ -1974,23 +1974,6 @@ static inline int safer_memcmp( const void *a, const void *b, size_t n )
return( diff ); 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 #ifdef __cplusplus
} }
#endif #endif

View file

@ -2609,8 +2609,7 @@ int ssl_read_record( ssl_context *ssl )
SSL_DEBUG_MSG( 2, ( "=> read record" ) ); SSL_DEBUG_MSG( 2, ( "=> read record" ) );
/* Temporarily disabled */ if( ssl->in_hslen != 0 && ssl->in_hslen < ssl->in_msglen )
if( ( 0 ) && ssl->in_hslen != 0 && ssl->in_hslen < ssl->in_msglen )
{ {
/* /*
* Get next Handshake message in the current record * Get next Handshake message in the current record