Skip to content

Commit d78f2ea

Browse files
committed
secure_storage: adapt build system for TF-PSA-Crypto
Minor changes that are required in order to move from Mbed TLS 3.6.5 to TF-PSA-Crypto 1.x: - "psa_crypto_driver_wrappers.h" has been relocated - some extra include folders are required because they are directly included from "psa_crypto_driver_wrappers.h" but not exported from "mbedTLS" library since they are meant to remain private. Signed-off-by: Valerio Setti <vsetti@baylibre.com>
1 parent 8975e28 commit d78f2ea

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

‎subsys/secure_storage/CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
zephyr_library()
44
zephyr_library_link_libraries_ifdef(CONFIG_MBEDTLS mbedTLS)
5+
# Add some Mbed TLS' internal folders where there are files included from
6+
# "psa_crypto_driver_wrappers.h" in "src/its/transform/aead.c".
7+
zephyr_library_include_directories(${ZEPHYR_MBEDTLS_MODULE_DIR}/tf-psa-crypto/core)
8+
zephyr_library_include_directories(${ZEPHYR_MBEDTLS_MODULE_DIR}/tf-psa-crypto/drivers/builtin/src)
59
zephyr_library_include_directories(include/internal) # secure_storage headers
610
add_subdirectory(src)
711

‎subsys/secure_storage/src/its/transform/aead.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Copyright (c) 2024 Nordic Semiconductor
22
* SPDX-License-Identifier: Apache-2.0
33
*/
4-
#include <../library/psa_crypto_driver_wrappers.h>
4+
#include <../core/psa_crypto_driver_wrappers.h>
55
#include <zephyr/secure_storage/its/transform.h>
66
#include <zephyr/secure_storage/its/transform/aead_get.h>
77
#include <zephyr/sys/__assert.h>

0 commit comments

Comments
 (0)