cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-11-04 04:32:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Drop records from wrong epoch

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-09-03 16:02:42 +02:00 committed by Paul Bakker
parent 0a65934ef3
commit 60ca5afaec
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/ssl_tls.c
View File

@ -2469,6 +2469,13 @@ int ssl_read_record( ssl_context *ssl )
return( ret ); return( ret );
} }
/*
* ContentType type;
* ProtocolVersion version;
* uint16 epoch; // DTLS only
* uint48 sequence_number; // DTLS only
* uint16 length;
*/
SSL_DEBUG_BUF( 4, "input record header", ssl->in_hdr, ssl_hdr_len( ssl ) ); SSL_DEBUG_BUF( 4, "input record header", ssl->in_hdr, ssl_hdr_len( ssl ) );
ssl->in_msgtype = ssl->in_hdr[0]; ssl->in_msgtype = ssl->in_hdr[0];
@ -2511,6 +2518,23 @@ int ssl_read_record( ssl_context *ssl )
return( POLARSSL_ERR_SSL_INVALID_RECORD ); return( POLARSSL_ERR_SSL_INVALID_RECORD );
} }
/* Check epoch with DTLS */
#if defined(POLARSSL_SSL_PROTO_DTLS)
if( ssl->transport == SSL_TRANSPORT_DATAGRAM )
{
unsigned int exp_epoch = ( ssl->in_ctr[0] << 8 ) | ssl->in_ctr[1];
unsigned int rec_epoch = ( ssl->in_hdr[3] << 8 ) | ssl->in_hdr[4];
if( exp_epoch != rec_epoch )
{
SSL_DEBUG_MSG( 1, ( "discarding record from another epoch: "
"expected %d, received %d",
exp_epoch, rec_epoch ) );
return( POLARSSL_ERR_NET_WANT_READ );
}
}
#endif
/* Check length against the size of our buffer */ /* Check length against the size of our buffer */
if( ssl->in_msglen > SSL_BUFFER_LEN if( ssl->in_msglen > SSL_BUFFER_LEN
- (size_t)( ssl->in_msg - ssl->in_buf ) ) - (size_t)( ssl->in_msg - ssl->in_buf ) )