Skip to content

Commit ef0749e

Browse files
tomi-fontrlubos
authored andcommitted
tf-m: enable CRYPTO_LIBRARY_ABI_COMPAT
ABI compatibility between NS and S is enforced (psa_key_attributes_t is padded on the NS side). Enable this new TF-M option to make new checks that were introduced compatible with this requirement. Signed-off-by: Tomi Fontanilles <[email protected]>
1 parent 18fad99 commit ef0749e

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

modules/trusted-firmware-m/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ set(CRYPTO_IOVEC_BUFFER_SIZE ${CONFIG_TFM_CRYPTO_IOVEC_BUFFER_SIZE
310310
set(CRYPTO_NV_SEED ${CONFIG_TFM_CRYPTO_NV_SEED})
311311
set(CRYPTO_SINGLE_PART_FUNCS_DISABLED ${CONFIG_TFM_CRYPTO_SINGLE_PART_FUNCS_DISABLED})
312312
set(CRYPTO_STACK_SIZE ${CONFIG_TFM_CRYPTO_PARTITION_STACK_SIZE})
313+
set(CRYPTO_LIBRARY_ABI_COMPAT ON)
313314
set(TFM_FWU_BUF_SIZE 0)
314315
set(FWU_STACK_SIZE 0)
315316
set(ATTEST_INCLUDE_OPTIONAL_CLAIMS ${CONFIG_TFM_ATTEST_INCLUDE_OPTIONAL_CLAIMS})

modules/trusted-firmware-m/tfm_config.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,9 @@
7878
/* The stack size of the Crypto Secure Partition */
7979
#cmakedefine CRYPTO_STACK_SIZE @CRYPTO_STACK_SIZE@
8080

81+
/* ABI compatibility between client and crypto service */
82+
#cmakedefine01 CRYPTO_LIBRARY_ABI_COMPAT
83+
8184
/* FWU Partition Configs */
8285

8386
/* Size of the FWU internal data transfer buffer */

0 commit comments

Comments
 (0)