mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2024-12-27 12:16:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9497 from minosgalanakis/bugfix/return_early_in_ccm_star

Browse Source 
ccm.c: Return early when ccm* is used without tag.
This commit is contained in:
Gilles Peskine 2024-09-13 09:35:18 +00:00 committed by GitHub
commit de4d5b7855
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tf-psa-crypto/drivers/builtin/src/ccm.c
View File

@ -167,11 +167,12 @@ static int ccm_calculate_first_block_if_ready(mbedtls_ccm_context *ctx)
}
/* CCM expects non-empty tag.
* CCM* allows empty tag. For CCM* without tag, ignore plaintext length.
* CCM* allows empty tag. For CCM* without tag, the tag calculation is skipped.
*/
if (ctx->tag_len == 0) {
if (ctx->mode == MBEDTLS_CCM_STAR_ENCRYPT || ctx->mode == MBEDTLS_CCM_STAR_DECRYPT) {
ctx->plaintext_len = 0;
return 0;
} else {
return MBEDTLS_ERR_CCM_BAD_INPUT;
}