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

Merge branch 'fix/mbedtls_null_pointer_dereference' into 'master'

Browse Source 
mbedtls: fix null pointer dereference of variable iv_off

See merge request espressif/esp-idf!22122
This commit is contained in:
Mahavir Jain 2023-01-25 13:37:34 +08:00
commit d825753387
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/mbedtls/port/aes/block/esp_aes.c
View File

@ -314,9 +314,6 @@ int esp_aes_crypt_cfb128(esp_aes_context *ctx,
const unsigned char *input, const unsigned char *input,
unsigned char *output ) unsigned char *output )
{ {
int c;
size_t n = *iv_off;
if (esp_aes_validate_input(ctx, input, output)) { if (esp_aes_validate_input(ctx, input, output)) {
return MBEDTLS_ERR_AES_BAD_INPUT_DATA; return MBEDTLS_ERR_AES_BAD_INPUT_DATA;
} }
@ -335,6 +332,8 @@ int esp_aes_crypt_cfb128(esp_aes_context *ctx,
return MBEDTLS_ERR_AES_INVALID_KEY_LENGTH; return MBEDTLS_ERR_AES_INVALID_KEY_LENGTH;
} }
int c;
size_t n = *iv_off;
esp_aes_acquire_hardware(); esp_aes_acquire_hardware();
ctx->key_in_hardware = 0; ctx->key_in_hardware = 0;
ctx->key_in_hardware = aes_hal_setkey(ctx->key, ctx->key_bytes, ESP_AES_ENCRYPT); ctx->key_in_hardware = aes_hal_setkey(ctx->key, ctx->key_bytes, ESP_AES_ENCRYPT);