Skip to content

Commit 76b3cf5

Browse files
committed
Merge branch 'fix/mbedtls_fs_io_dependency_on_vfs' into 'master'
fix(mbedtls): Fix the MBEDTLS_FS_IO dependency on vfs Closes IDFGH-13518 See merge request espressif/esp-idf!33020
2 parents a6091df + 1b770c3 commit 76b3cf5

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

components/mbedtls/Kconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,4 +1192,14 @@ menu "mbedTLS"
11921192
the flash footprint and hence care must be taken to keep some reserved space
11931193
for the application binary in flash layout.
11941194

1195+
config MBEDTLS_FS_IO
1196+
bool "Enable functions that use the filesystem"
1197+
default y
1198+
depends on (VFS_SUPPORT_IO && VFS_SUPPORT_DIR) || IDF_TARGET_LINUX
1199+
help
1200+
This option enables functions in mbedTLS that use the filesystem.
1201+
It uses the default filesystem support for the target,
1202+
which is added through vfs component for ESP32 based targets or by
1203+
the host system when the target is Linux.
1204+
11951205
endmenu # mbedTLS

components/mbedtls/port/include/mbedtls/esp_config.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,13 @@
901901
*
902902
* Enable functions that use the filesystem.
903903
*/
904+
#if CONFIG_MBEDTLS_FS_IO
904905
#define MBEDTLS_FS_IO
906+
#else
907+
#undef MBEDTLS_FS_IO
908+
#undef MBEDTLS_PSA_ITS_FILE_C
909+
#undef MBEDTLS_PSA_CRYPTO_STORAGE_C
910+
#endif
905911

906912
#ifndef CONFIG_IDF_TARGET_LINUX
907913
/**

0 commit comments

Comments
 (0)