yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-23 16:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make allocation of reassembly bitmap optional

Browse source 
This commit adds a parameter to ssl_prepare_reassembly_buffer()
allowing to disable the allocation of space for a reassembly bitmap.
This will allow this function to be used for the allocation of buffers
for future handshake messages in case these need no fragmentation.
This commit is contained in:
Hanno Becker 2018-08-16 09:14:58 +01:00
parent 56e205e2c9
commit d07df86871
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/ssl_tls.c
View file

@ -3473,6 +3473,7 @@ static int ssl_bitmask_check( unsigned char *mask, size_t len )
/* msg_len does not include the handshake header */ /* msg_len does not include the handshake header */
static int ssl_prepare_reassembly_buffer( mbedtls_ssl_context *ssl, /* debug */ static int ssl_prepare_reassembly_buffer( mbedtls_ssl_context *ssl, /* debug */
unsigned msg_len, unsigned msg_len,
unsigned add_bitmap,
unsigned char **target ) unsigned char **target )
{ {
size_t alloc_len; size_t alloc_len;
@ -3490,7 +3491,9 @@ static int ssl_prepare_reassembly_buffer( mbedtls_ssl_context *ssl, /* debug */
alloc_len = 12; /* Handshake header */ alloc_len = 12; /* Handshake header */
alloc_len += msg_len; /* Content buffer */ alloc_len += msg_len; /* Content buffer */
alloc_len += msg_len / 8 + ( msg_len % 8 != 0 ); /* Bitmap */
if( add_bitmap )
alloc_len += msg_len / 8 + ( msg_len % 8 != 0 ); /* Bitmap */
buf = mbedtls_calloc( 1, alloc_len ); buf = mbedtls_calloc( 1, alloc_len );
if( buf == NULL ) if( buf == NULL )
@ -3528,7 +3531,8 @@ static int ssl_reassemble_dtls_handshake( mbedtls_ssl_context *ssl )
*/ */
if( ssl->handshake->hs_msg == NULL ) if( ssl->handshake->hs_msg == NULL )
{ {
ret = ssl_prepare_reassembly_buffer( msg_len, &ssl->handshake->hs_msg ); ret = ssl_prepare_reassembly_buffer( msg_len, 1,
&ssl->handshake->hs_msg );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );