alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-21 06:56:11 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/supplicant_tls_fix_v5.2' into 'release/v5.2'

Browse Source 
fix(wpa_supplicant): Correct iv lenght passed in mbedtls_cipher_set_iv() (v5.2)

See merge request espressif/esp-idf!26845
This commit is contained in:
Jiang Jiang Jian 2023-11-03 20:54:13 +08:00
commit cd33e77e0f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
components/wpa_supplicant/esp_supplicant/src/crypto/crypto_mbedtls.c
View File

@ -506,16 +506,19 @@ static int crypto_init_cipher_ctx(mbedtls_cipher_context_t *ctx,
return -1; return -1;
} }
if (mbedtls_cipher_setkey(ctx, key, key_len * 8, operation) != 0) { ret = mbedtls_cipher_setkey(ctx, key, key_len * 8, operation);
wpa_printf(MSG_ERROR, "mbedtls_cipher_setkey returned error"); if (ret != 0) {
wpa_printf(MSG_ERROR, "mbedtls_cipher_setkey returned error=%d", ret);
return -1; return -1;
} }
if (mbedtls_cipher_set_iv(ctx, iv, cipher_info->MBEDTLS_PRIVATE(iv_size)) != 0) { ret = mbedtls_cipher_set_iv(ctx, iv, cipher_info->MBEDTLS_PRIVATE(iv_size) << MBEDTLS_IV_SIZE_SHIFT);
wpa_printf(MSG_ERROR, "mbedtls_cipher_set_iv returned error"); if (ret != 0) {
wpa_printf(MSG_ERROR, "mbedtls_cipher_set_iv returned error=%d", ret);
return -1; return -1;
} }
if (mbedtls_cipher_reset(ctx) != 0) { ret = mbedtls_cipher_reset(ctx);
wpa_printf(MSG_ERROR, "mbedtls_cipher_reset() returned error"); if (ret != 0) {
wpa_printf(MSG_ERROR, "mbedtls_cipher_reset() returned error=%d", ret);
return -1; return -1;
} }