Mbed-TLS/mbedtls-framework
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls-framework.git synced 2026-07-27 22:37:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support new threading interface where mutex_init returns int

Browse Source 
Signed-off-by: Gilles Peskine <[email protected]>
This commit is contained in:
Gilles Peskine
2025-09-05 21:15:55 +02:00
parent bf53c3d027
commit bedd856cad
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/src/threading_helpers.c
+19 -2
View File
@@ -172,8 +172,14 @@ static mbedtls_threading_mutex_t *mutex_container(
#endif /* MBEDTLS_THREADING_INTERNAL_VERSION */
#if MBEDTLS_THREADING_INTERNAL_VERSION >= 0x04000001
typedef int mutex_init_return_t;
#else
typedef void mutex_init_return_t;
#endif
typedef struct {
void (*init)(mbedtls_platform_mutex_t *);
mutex_init_return_t (*init)(mbedtls_platform_mutex_t *);
void (*free)(mbedtls_platform_mutex_t *);
int (*lock)(mbedtls_platform_mutex_t *);
int (*unlock)(mbedtls_platform_mutex_t *);
@@ -235,9 +241,16 @@ static int mbedtls_test_mutex_can_test(mbedtls_platform_mutex_t *mutex)
return 1;
}
static void mbedtls_test_wrap_mutex_init(mbedtls_platform_mutex_t *mutex)
static mutex_init_return_t mbedtls_test_wrap_mutex_init(mbedtls_platform_mutex_t *mutex)
{
#if MBEDTLS_THREADING_INTERNAL_VERSION >= 0x04000001
int ret = mutex_functions.init(mutex);
if (ret != 0) {
return ret;
}
#else
mutex_functions.init(mutex);
#endif
if (mbedtls_test_mutex_can_test(mutex)) {
if (mutex_functions.lock(&mbedtls_test_mutex_mutex) == 0) {
@@ -247,6 +260,10 @@ static void mbedtls_test_wrap_mutex_init(mbedtls_platform_mutex_t *mutex)
mutex_functions.unlock(&mbedtls_test_mutex_mutex);
}
}
#if MBEDTLS_THREADING_INTERNAL_VERSION >= 0x04000001
return 0;
#endif
}
static void mbedtls_test_wrap_mutex_free(mbedtls_platform_mutex_t *mutex)