Skip to content

Commit d5f6fe4

Browse files
rluboscarlescufi
authored andcommitted
modules: mbedtls: Build psa_crypto_slot_management conditionally
TFM redefines functions from mbed TLS's psa_crypto_slot_management.c, therefore that file should not be included in build when TFM is enabled. Otherwise, the linker reports an error about redefined functions like psa_open_key() etc. Signed-off-by: Robert Lubos <[email protected]>
1 parent 561f220 commit d5f6fe4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

modules/mbedtls/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ zephyr_interface_library_named(mbedTLS)
117117
${ZEPHYR_CURRENT_MODULE_DIR}/library/psa_crypto_mac.c
118118
${ZEPHYR_CURRENT_MODULE_DIR}/library/psa_crypto_rsa.c
119119
${ZEPHYR_CURRENT_MODULE_DIR}/library/psa_crypto_se.c
120-
${ZEPHYR_CURRENT_MODULE_DIR}/library/psa_crypto_slot_management.c
121120
${ZEPHYR_CURRENT_MODULE_DIR}/library/psa_crypto_storage.c
122121
${ZEPHYR_CURRENT_MODULE_DIR}/library/psa_its_file.c
123122
)
@@ -127,6 +126,7 @@ zephyr_interface_library_named(mbedTLS)
127126
list(APPEND crypto_source
128127
${ZEPHYR_CURRENT_MODULE_DIR}/library/psa_crypto.c
129128
${ZEPHYR_CURRENT_MODULE_DIR}/library/psa_crypto_client.c
129+
${ZEPHYR_CURRENT_MODULE_DIR}/library/psa_crypto_slot_management.c
130130
)
131131
endif()
132132

0 commit comments

Comments
 (0)