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

Merge branch 'bugfix/eap_client_crash' into 'master'

Browse Source 
wpa_supplicant: Fix null pointer deference and memleak

Closes IDFGH-3699

See merge request espressif/esp-idf!9690
This commit is contained in:
Jiang Jiang Jian
2020-07-23 10:16:05 +08:00
parent 730db68fe9 5502a553a7
commit 803cf064d2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/wpa_supplicant/src/crypto/tls_mbedtls.c
View File

@@ -384,7 +384,7 @@ static void tls_set_ciphersuite(tls_context_t *tls)
if (tls->ciphersuite[0]) { if (tls->ciphersuite[0]) {
mbedtls_ssl_conf_ciphersuites(&tls->conf, tls->ciphersuite); mbedtls_ssl_conf_ciphersuites(&tls->conf, tls->ciphersuite);
} else if (mbedtls_pk_get_bitlen(&tls->clientkey) > 2048 || } else if (mbedtls_pk_get_bitlen(&tls->clientkey) > 2048 ||
mbedtls_pk_get_bitlen(&tls->cacert_ptr->pk) > 2048) { (tls->cacert_ptr && mbedtls_pk_get_bitlen(&tls->cacert_ptr->pk) > 2048)) {
mbedtls_ssl_conf_ciphersuites(&tls->conf, eap_ciphersuite_preference); mbedtls_ssl_conf_ciphersuites(&tls->conf, eap_ciphersuite_preference);
} }
} }
@@ -504,6 +504,7 @@ void tls_connection_deinit(void *tls_ctx, struct tls_connection *conn)
{ {
/* Free ssl ctx and data */ /* Free ssl ctx and data */
tls_mbedtls_conn_delete((tls_context_t *) conn->tls); tls_mbedtls_conn_delete((tls_context_t *) conn->tls);
os_free(conn->tls);
conn->tls = NULL; conn->tls = NULL;
/* Data in in ssl ctx, free connection */ /* Data in in ssl ctx, free connection */
os_free(conn); os_free(conn);