AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix incorrect enums being used

Browse Source 
Fix memory leak due to aead_abort() using incorrect enums to identify
algorithm used. Fix incorrect return on failure to check tag on
aead_verify()

Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
Paul Elliott 2021-04-22 11:31:14 +01:00
parent 5653da0201
commit 811d8d462f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/psa_crypto_aead.c
View File

@ -948,7 +948,7 @@ psa_status_t mbedtls_psa_aead_verify( psa_aead_operation_t *operation,
{ {
if( do_tag_check && safer_memcmp(tag, check_tag, tag_length) != 0 ) if( do_tag_check && safer_memcmp(tag, check_tag, tag_length) != 0 )
{ {
status = MBEDTLS_ERR_GCM_AUTH_FAILED; status = PSA_ERROR_INVALID_SIGNATURE;
} }
} }
@ -960,10 +960,10 @@ psa_status_t mbedtls_psa_aead_verify( psa_aead_operation_t *operation,
/* Abort an AEAD operation */ /* Abort an AEAD operation */
psa_status_t mbedtls_psa_aead_abort( psa_aead_operation_t *operation ) psa_status_t mbedtls_psa_aead_abort( psa_aead_operation_t *operation )
{ {
switch( operation->alg ) switch( operation->alg )
{ {
#if defined(MBEDTLS_CCM_C) #if defined(MBEDTLS_PSA_BUILTIN_ALG_CCM)
case MBEDTLS_PSA_BUILTIN_ALG_CCM: case PSA_ALG_CCM:
mbedtls_ccm_free( &operation->ctx.ccm ); mbedtls_ccm_free( &operation->ctx.ccm );
break; break;
#endif /* MBEDTLS_PSA_BUILTIN_ALG_CCM */ #endif /* MBEDTLS_PSA_BUILTIN_ALG_CCM */
@ -973,9 +973,9 @@ psa_status_t mbedtls_psa_aead_abort( psa_aead_operation_t *operation )
break; break;
#endif /* MBEDTLS_PSA_BUILTIN_ALG_GCM */ #endif /* MBEDTLS_PSA_BUILTIN_ALG_GCM */
#if defined(MBEDTLS_PSA_BUILTIN_ALG_CHACHA20_POLY1305) #if defined(MBEDTLS_PSA_BUILTIN_ALG_CHACHA20_POLY1305)
case PSA_ALG_CHACHA20_POLY1305: case PSA_ALG_CHACHA20_POLY1305:
mbedtls_chachapoly_free( &operation->ctx.chachapoly ); mbedtls_chachapoly_free( &operation->ctx.chachapoly );
break; break;
#endif /* MBEDTLS_PSA_BUILTIN_ALG_CHACHA20_POLY1305 */ #endif /* MBEDTLS_PSA_BUILTIN_ALG_CHACHA20_POLY1305 */
} }