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

Validate tag pointer in ccm function.

Browse source 
Signed-off-by: Mateusz Starzyk <mateusz.starzyk@mobica.com>
This commit is contained in:
Mateusz Starzyk 2021-07-28 15:39:51 +02:00
parent 1bda9451ef
commit c8bdf36a72
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/ccm.c
View file

@ -478,7 +478,8 @@ int mbedtls_ccm_finish( mbedtls_ccm_context *ctx,
ret = mbedtls_ccm_crypt( ctx, 0, 16, ctx->y, ctx->y );
if( ret != 0 )
return ret;
memcpy( tag, ctx->y, tag_len );
if( tag != NULL )
memcpy( tag, ctx->y, tag_len );
mbedtls_ccm_clear_state(ctx);
return( 0 );

5
tests/suites/test_suite_ccm.function
View file

@ -48,10 +48,7 @@ static int check_multipart( mbedtls_ccm_context *ctx,
mbedtls_free( output );
output = NULL;
if( tag->len == 0 )
ASSERT_ALLOC( output, 16 );
else
ASSERT_ALLOC( output, tag->len );
ASSERT_ALLOC( output, tag->len );
TEST_EQUAL( 0, mbedtls_ccm_finish( ctx, output, tag->len ) );
ASSERT_COMPARE( output, tag->len, tag->x, tag->len );
mbedtls_free( output );