lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-28 00:21:48 +03:00
Code Activity

Fix client-initiated renegotiation with DTLS

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard
2014-08-19 17:43:50 +02:00
committed by Paul Bakker
parent b35fe5638a
commit 30d16eb429
3 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
library/ssl_tls.c
View File

@ -2141,7 +2141,8 @@ static int ssl_prepare_handshake_record( ssl_context *ssl )
* TLS handshake format to other functions.
*/
#if defined(POLARSSL_SSL_PROTO_DTLS)
if( ssl->transport == SSL_TRANSPORT_DATAGRAM )
if( ssl->transport == SSL_TRANSPORT_DATAGRAM &&
ssl->state != SSL_HANDSHAKE_OVER )
{
// TODO: DTLS: check message_seq
@ -2289,11 +2290,13 @@ int ssl_read_record( ssl_context *ssl )
return( ret );
}
#if defined(POLARSSL_SSL_PROTO_DTLS)
/* Done reading this record, get ready for the next one */
#if defined(POLARSSL_SSL_PROTO_DTLS)
if( ssl->transport == SSL_TRANSPORT_DATAGRAM )
ssl->next_record_offset = ssl->in_msglen + ssl_hdr_len( ssl );
else
#endif
ssl->in_left = 0;
SSL_DEBUG_BUF( 4, "input record from network",
ssl->in_hdr, ssl_hdr_len( ssl ) + ssl->in_msglen );
@ -2402,12 +2405,6 @@ int ssl_read_record( ssl_context *ssl )
}
}
/* With DTLS there might be other records in the same datagram */
#if defined(POLARSSL_SSL_PROTO_DTLS)
if( ssl->transport != SSL_TRANSPORT_DATAGRAM )
#endif
ssl->in_left = 0;
SSL_DEBUG_MSG( 2, ( "<= read record" ) );
return( 0 );