From d6225e9d73160e778e0332f35b3271a53a1c83ea Mon Sep 17 00:00:00 2001 From: Tamas Ban Date: Mon, 7 Oct 2024 11:34:06 +0200 Subject: [PATCH 1/2] chore(tc): link QCBOR library to the platform test The delegated attestation service was updated to be aligned with RMM spec 1.0-rel0-rc2 version. The test suite uses the QCBOR library to encode the public key to be a CBOR serialized COSE_Key object. Signed-off-by: Tamas Ban Change-Id: Ib9e1d80f7b4bca8783ae1f7cf4567725c2aa8538 --- plat/arm/board/tc/platform_test.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plat/arm/board/tc/platform_test.mk b/plat/arm/board/tc/platform_test.mk index 8d393254c..2ce664859 100644 --- a/plat/arm/board/tc/platform_test.mk +++ b/plat/arm/board/tc/platform_test.mk @@ -33,6 +33,7 @@ else ifeq (${PLATFORM_TEST},rse-rotpk) $(eval $(call add_define,PLATFORM_TEST_ROTPK)) else ifeq (${PLATFORM_TEST},tfm-testsuite) include drivers/arm/rse/rse_comms.mk + include drivers/measured_boot/rse/qcbor.mk # The variables need to be set to compile the platform test: ifeq (${TF_M_TESTS_PATH},) @@ -80,7 +81,8 @@ else ifeq (${PLATFORM_TEST},tfm-testsuite) $(DELEGATED_ATTEST_TESTS_PATH)/delegated_attest_test.c \ drivers/auth/mbedtls/mbedtls_common.c \ lib/psa/measured_boot.c \ - lib/psa/delegated_attestation.c + lib/psa/delegated_attestation.c \ + ${QCBOR_SOURCES} PLAT_INCLUDES += -I$(TF_M_EXTRAS_PATH)/partitions/measured_boot/interface/include \ -I$(TF_M_EXTRAS_PATH)/partitions/delegated_attestation/interface/include \ @@ -93,7 +95,8 @@ else ifeq (${PLATFORM_TEST},tfm-testsuite) -Iplat/arm/board/tc \ -Iinclude/drivers/auth/mbedtls \ -Iinclude/drivers/arm \ - -Iinclude/lib/psa + -Iinclude/lib/psa \ + -I${QCBOR_INCLUDES} # Some of the PSA functions are declared in multiple header files, that # triggers this warning. From 41d8c6a033c59c7c955420585f26edd484a54a24 Mon Sep 17 00:00:00 2001 From: Tamas Ban Date: Mon, 7 Oct 2024 12:05:49 +0200 Subject: [PATCH 2/2] chore(tc): increase stack size with 0x100 bytes CBOR encoding in the platform test requires a slightly bigger stack, so increase it with 0x100 bytes. Signed-off-by: Tamas Ban Change-Id: I1b151aa29b3ccfcefa733d189d7aab88653cef1f --- plat/arm/board/tc/include/platform_def.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plat/arm/board/tc/include/platform_def.h b/plat/arm/board/tc/include/platform_def.h index 0652148b1..3316fb96a 100644 --- a/plat/arm/board/tc/include/platform_def.h +++ b/plat/arm/board/tc/include/platform_def.h @@ -192,7 +192,7 @@ # if SPM_MM # define PLATFORM_STACK_SIZE 0x500 # else -# define PLATFORM_STACK_SIZE 0xa00 +# define PLATFORM_STACK_SIZE 0xb00 # endif #elif defined(IMAGE_BL32) # define PLATFORM_STACK_SIZE 0x440