espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 20:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

mbedtls: fix esp_aes_crypt_ctr writing to null stream block

Browse Source
This commit is contained in:
harshal.patil
2022-12-08 10:26:25 +05:30
parent ea07ce9367
commit 40f2caa950
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/mbedtls/port/aes/esp_aes_gcm.c
View File

@@ -496,6 +496,7 @@ int esp_aes_gcm_finish( esp_gcm_context *ctx,
{ {
size_t nc_off = 0; size_t nc_off = 0;
uint8_t len_block[AES_BLOCK_BYTES] = {0}; uint8_t len_block[AES_BLOCK_BYTES] = {0};
uint8_t stream[AES_BLOCK_BYTES] = {0};
if ( tag_len > 16 || tag_len < 4 ) { if ( tag_len > 16 || tag_len < 4 ) {
return ( MBEDTLS_ERR_GCM_BAD_INPUT ); return ( MBEDTLS_ERR_GCM_BAD_INPUT );
@@ -507,7 +508,7 @@ int esp_aes_gcm_finish( esp_gcm_context *ctx,
esp_gcm_ghash(ctx, len_block, AES_BLOCK_BYTES, ctx->ghash); esp_gcm_ghash(ctx, len_block, AES_BLOCK_BYTES, ctx->ghash);
/* Tag T = GCTR(J0, ) where T is truncated to tag_len */ /* Tag T = GCTR(J0, ) where T is truncated to tag_len */
esp_aes_crypt_ctr(&ctx->aes_ctx, tag_len, &nc_off, ctx->ori_j0, 0, ctx->ghash, tag); esp_aes_crypt_ctr(&ctx->aes_ctx, tag_len, &nc_off, ctx->ori_j0, stream, ctx->ghash, tag);
return 0; return 0;
} }