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

Merge branch 'fix/ssl_crash_with_rom_crypto_impl_v5.4' into 'release/v5.4'

Browse Source 
fix(mbedtls): fix ROM mbedTLS threading alt issues (v5.4)

See merge request espressif/esp-idf!48672
This commit is contained in:
Jiang Jiang Jian
2026-05-20 10:34:18 +08:00
parent 99959fe349 1c9d738fde
commit 904e4d2594
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/mbedtls/port/mbedtls_rom/mbedtls_rom_osi.c
+12 -1
View File
@@ -1,5 +1,5 @@
/*
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
* SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0
*/
@@ -26,6 +26,7 @@ static void mbedtls_rom_mutex_init( mbedtls_threading_mutex_t *mutex )
#if defined(MBEDTLS_THREADING_ALT)
mutex->mutex = xSemaphoreCreateMutex();
assert(mutex->mutex != NULL);
mutex->is_valid = 1;
#else
mbedtls_mutex_init(mutex);
#endif
@@ -38,7 +39,11 @@ static void mbedtls_rom_mutex_free( mbedtls_threading_mutex_t *mutex )
}
#if defined(MBEDTLS_THREADING_ALT)
if (!mutex->is_valid) {
return;
}
vSemaphoreDelete(mutex->mutex);
mutex->is_valid = 0;
#else
mbedtls_mutex_free(mutex);
#endif
@@ -51,6 +56,9 @@ static int mbedtls_rom_mutex_lock( mbedtls_threading_mutex_t *mutex )
}
#if defined(MBEDTLS_THREADING_ALT)
if (!mutex->is_valid) {
return MBEDTLS_ERR_THREADING_MUTEX_ERROR;
}
if (xSemaphoreTake(mutex->mutex, portMAX_DELAY) != pdTRUE) {
return MBEDTLS_ERR_THREADING_MUTEX_ERROR;
}
@@ -67,6 +75,9 @@ static int mbedtls_rom_mutex_unlock( mbedtls_threading_mutex_t *mutex )
}
#if defined(MBEDTLS_THREADING_ALT)
if (!mutex->is_valid) {
return MBEDTLS_ERR_THREADING_MUTEX_ERROR;
}
if (xSemaphoreGive(mutex->mutex) != pdTRUE) {
return MBEDTLS_ERR_THREADING_MUTEX_ERROR;
}