alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

mbedtls: fix esp_aes_gcm_update_ad() API implementation

Browse Source
This commit is contained in:
harshal.patil 2022-12-23 16:18:33 +05:30
parent 48840d04f0
commit f9f10c2590
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -352,6 +352,8 @@ int esp_aes_gcm_starts( esp_gcm_context *ctx,
/* Initialize AES-GCM context */ /* Initialize AES-GCM context */
memset(ctx->ghash, 0, sizeof(ctx->ghash)); memset(ctx->ghash, 0, sizeof(ctx->ghash));
ctx->data_len = 0; ctx->data_len = 0;
ctx->aad = NULL;
ctx->aad_len = 0;
ctx->iv = iv; ctx->iv = iv;
ctx->iv_len = iv_len; ctx->iv_len = iv_len;
@ -371,6 +373,15 @@ int esp_aes_gcm_starts( esp_gcm_context *ctx,
gcm_gen_table(ctx); gcm_gen_table(ctx);
} }
/* Once H is obtained we need to derive J0 (Initial Counter Block) */
esp_gcm_derive_J0(ctx);
/* The initial counter block keeps updating during the esp_gcm_update call
* however to calculate final authentication tag T we need original J0
* so we make a copy here
*/
memcpy(ctx->ori_j0, ctx->J0, 16);
ctx->gcm_state = ESP_AES_GCM_STATE_START; ctx->gcm_state = ESP_AES_GCM_STATE_START;
return ( 0 ); return ( 0 );
@ -395,26 +406,14 @@ int esp_aes_gcm_update_ad( esp_gcm_context *ctx,
return -1; return -1;
} }
/* Initialize AES-GCM context */
memset(ctx->ghash, 0, sizeof(ctx->ghash));
ctx->data_len = 0;
ctx->aad = aad;
ctx->aad_len = aad_len;
if (ctx->gcm_state != ESP_AES_GCM_STATE_START) { if (ctx->gcm_state != ESP_AES_GCM_STATE_START) {
ESP_LOGE(TAG, "AES context in invalid state!"); ESP_LOGE(TAG, "AES context in invalid state!");
return -1; return -1;
} }
/* Once H is obtained we need to derive J0 (Initial Counter Block) */ /* Initialise associated data */
esp_gcm_derive_J0(ctx); ctx->aad = aad;
ctx->aad_len = aad_len;
/* The initial counter block keeps updating during the esp_gcm_update call
* however to calculate final authentication tag T we need original J0
* so we make a copy here
*/
memcpy(ctx->ori_j0, ctx->J0, 16);
esp_gcm_ghash(ctx, ctx->aad, ctx->aad_len, ctx->ghash); esp_gcm_ghash(ctx, ctx->aad, ctx->aad_len, ctx->ghash);