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 'feature/upgrade_mbedtls_to_v4.1' into 'release/v4.1'

Browse Source 
mbedtls: upgrade to release v2.16.5 (v4.1)

See merge request espressif/esp-idf!7986
This commit is contained in:
Mahavir Jain 2020-03-24 13:46:00 +08:00
commit 6e0b8af978
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/bootloader_support/src/idf/secure_boot_signatures.c
View File

@ -207,6 +207,7 @@ esp_err_t esp_secure_boot_verify_rsa_signature_block(const ets_secure_boot_signa
}
mbedtls_entropy_init(&entropy);
mbedtls_ctr_drbg_init(&ctr_drbg);
ret = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, NULL, 0);
if (ret != 0) {
ESP_LOGE(TAG, "mbedtls_ctr_drbg_seed returned -0x%04x\n", ret);

2
components/mbedtls/mbedtls

@ -1 +1 @@
Subproject commit f5f2e5926cd294ae7cb579ff6a12ad9303caeb6e
Subproject commit 9ef92c551eb8d92677034c3ec8078a8076febf41

9
components/wpa_supplicant/src/crypto/crypto_mbedtls.c
View File

@ -266,7 +266,7 @@ struct crypto_ec *crypto_ec_init(int group)
return NULL;
}
mbedtls_ecp_group_init( &e->group );
mbedtls_ecp_group_init(&e->group);
if (mbedtls_ecp_group_load(&e->group, grp_id)) {
crypto_ec_deinit(e);
@ -283,7 +283,7 @@ void crypto_ec_deinit(struct crypto_ec *e)
return;
}
mbedtls_ecp_group_free( &e->group );
mbedtls_ecp_group_free(&e->group);
os_free(e);
}
@ -417,6 +417,7 @@ int crypto_ec_point_mul(struct crypto_ec *e, const struct crypto_ec_point *p,
mbedtls_ctr_drbg_context ctr_drbg;
mbedtls_entropy_init(&entropy);
mbedtls_ctr_drbg_init(&ctr_drbg);
MBEDTLS_MPI_CHK(mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy,
NULL, 0));
@ -428,8 +429,8 @@ int crypto_ec_point_mul(struct crypto_ec *e, const struct crypto_ec_point *p,
mbedtls_ctr_drbg_random,
&ctr_drbg));
cleanup:
mbedtls_ctr_drbg_free( &ctr_drbg );
mbedtls_entropy_free( &entropy );
mbedtls_ctr_drbg_free(&ctr_drbg);
mbedtls_entropy_free(&entropy);
return ret ? -1 : 0;
}