Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 18:50:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/fix_psk_hint_key_null_dereference' into 'master'

Browse Source 
Fix/fix psk hint key null dereference

Closes IDF-15854 and TZ-2615

See merge request espressif/esp-idf!50179
This commit is contained in:
Mahavir Jain
2026-07-03 09:39:31 +05:30
parent 625ee1abb7 6d1beb1f23
commit 6df37e9bec
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp-tls/esp_tls_mbedtls.c
+8
View File
@@ -845,6 +845,10 @@ static esp_err_t set_server_config(esp_tls_cfg_server_t *cfg, esp_tls_t *tls)
#if defined(CONFIG_ESP_TLS_PSK_VERIFICATION)
} else if (cfg->psk_hint_key) {
ESP_LOGD(TAG, "PSK authentication");
if (cfg->psk_hint_key->hint == NULL) {
ESP_LOGE(TAG, "Failed to use psk_hint_key");
return ESP_ERR_MBEDTLS_SSL_CONF_PSK_FAILED;
}
ret = mbedtls_ssl_conf_psk(&tls->conf, cfg->psk_hint_key->key, cfg->psk_hint_key->key_size,
(const unsigned char *)cfg->psk_hint_key->hint, strlen(cfg->psk_hint_key->hint));
if (ret != 0) {
@@ -999,6 +1003,10 @@ esp_err_t set_client_config(const char *hostname, size_t hostlen, esp_tls_cfg_t
//
// PSK encryption mode is configured only if no certificate supplied and psk pointer not null
ESP_LOGD(TAG, "ssl psk authentication");
if (cfg->psk_hint_key->hint == NULL) {
ESP_LOGE(TAG, "Failed to use psk_hint_key");
return ESP_ERR_MBEDTLS_SSL_CONF_PSK_FAILED;
}
ret = mbedtls_ssl_conf_psk(&tls->conf, cfg->psk_hint_key->key, cfg->psk_hint_key->key_size,
(const unsigned char *)cfg->psk_hint_key->hint, strlen(cfg->psk_hint_key->hint));
if (ret != 0) {