From 86b666548b97f0fa5f4ec05e9b6f92a2bfe5a4ed Mon Sep 17 00:00:00 2001 From: Pavel Vasilyev Date: Tue, 8 Oct 2024 11:09:32 +0200 Subject: [PATCH] modules: mbedtls: Enable back Mbed TLS PSA Crypto Storage C This partially reverts https://github.com/zephyrproject-rtos/zephyr/commit/4b479016a792a24704352566bdbf726493dd08ae to fix Bluetooth mesh tests with bsim. Fixes #79533 Signed-off-by: Pavel Vasilyev --- modules/mbedtls/configs/config-tls-generic.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/mbedtls/configs/config-tls-generic.h b/modules/mbedtls/configs/config-tls-generic.h index c4422772aea..aff59f9e17e 100644 --- a/modules/mbedtls/configs/config-tls-generic.h +++ b/modules/mbedtls/configs/config-tls-generic.h @@ -482,11 +482,13 @@ #define MBEDTLS_PSA_P256M_DRIVER_ENABLED #endif -#if defined(CONFIG_ARCH_POSIX) +#if defined(CONFIG_ARCH_POSIX) && !defined(CONFIG_PICOLIBC) #define MBEDTLS_PSA_KEY_SLOT_COUNT 64 /* for BLE Mesh tests */ +#define MBEDTLS_PSA_ITS_FILE_C +#define MBEDTLS_FS_IO #endif -#if defined(CONFIG_SECURE_STORAGE) +#if defined(CONFIG_SECURE_STORAGE) || (defined(CONFIG_ARCH_POSIX) && !defined(CONFIG_PICOLIBC)) #define MBEDTLS_PSA_CRYPTO_STORAGE_C #endif