commit d15f99c8eb5ac8cac262226eb7b07b6e3a9d1e45
author Xinyu Zhang <xinyu.zhang@arm.com> Thu Oct 27 15:03:34 2022 +0800
committer Xinyu Zhang <xinyu.zhang@arm.com> Mon Nov 21 15:28:55 2022 +0800
tree 5acd70a43e4825ff7731dcbceb19c4f5a7f61974
parent ff653724c1d9106ebd6df222cba0e01c0a0ab069

Attest: Set features with config header file

Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
Change-Id: Ida7dd261415ac660a425931624a658d766745b91

platform/CMakeLists.txt

diff --git a/platform/CMakeLists.txt b/platform/CMakeLists.txt
index db47177..055e1f5 100755
--- a/platform/CMakeLists.txt
+++ b/platform/CMakeLists.txt
@@ -128,7 +128,6 @@
     PRIVATE
         $<$<BOOL:${SYMMETRIC_INITIAL_ATTESTATION}>:SYMMETRIC_INITIAL_ATTESTATION>
         $<$<BOOL:${TFM_DUMMY_PROVISIONING}>:TFM_DUMMY_PROVISIONING>
-        $<$<BOOL:${ATTEST_INCLUDE_COSE_KEY_ID}>:ATTEST_INCLUDE_COSE_KEY_ID>
         $<$<BOOL:${PLATFORM_DEFAULT_NV_COUNTERS}>:PLATFORM_DEFAULT_NV_COUNTERS>
         $<$<BOOL:${PLATFORM_DEFAULT_OTP_WRITEABLE}>:OTP_WRITEABLE>
 )
@@ -216,7 +215,6 @@
             $<$<BOOL:${PLATFORM_DEFAULT_OTP}>:PLATFORM_DEFAULT_OTP>
             $<$<BOOL:${OTP_NV_COUNTERS_RAM_EMULATION}>:OTP_NV_COUNTERS_RAM_EMULATION>
             $<$<BOOL:${TFM_DUMMY_PROVISIONING}>:TFM_DUMMY_PROVISIONING>
-            $<$<BOOL:${ATTEST_INCLUDE_COSE_KEY_ID}>:ATTEST_INCLUDE_COSE_KEY_ID>
             $<$<BOOL:${PLATFORM_DEFAULT_NV_COUNTERS}>:PLATFORM_DEFAULT_NV_COUNTERS>
             $<$<BOOL:${PLATFORM_DEFAULT_OTP_WRITEABLE}>:OTP_WRITEABLE>
     )

platform/ext/accelerator/cc312/CMakeLists.txt

diff --git a/platform/ext/accelerator/cc312/CMakeLists.txt b/platform/ext/accelerator/cc312/CMakeLists.txt
index bb9c130..8cb64e4 100644
--- a/platform/ext/accelerator/cc312/CMakeLists.txt
+++ b/platform/ext/accelerator/cc312/CMakeLists.txt
@@ -114,6 +114,7 @@
     target_link_libraries(platform_bl2
         PRIVATE
             bl2_crypto_hw
+            tfm_config
     )
 
     target_link_libraries(${CC312_LIB_PREFIX}cc312_cdmpu

platform/ext/accelerator/cc312/otp_cc312.c

diff --git a/platform/ext/accelerator/cc312/otp_cc312.c b/platform/ext/accelerator/cc312/otp_cc312.c
index 61573c2..2909f8f 100644
--- a/platform/ext/accelerator/cc312/otp_cc312.c
+++ b/platform/ext/accelerator/cc312/otp_cc312.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include "config_attest.h"
 #include "tfm_plat_otp.h"
 
 #include "cmsis_compiler.h"
@@ -513,7 +514,7 @@
         return err;
     }
 
-#ifdef ATTEST_INCLUDE_COSE_KEY_ID
+#if ATTEST_INCLUDE_COSE_KEY_ID
     err = verify_zero_bits_count(otp->iak_id,
                                  sizeof(otp->iak_id),
                                  (uint8_t*)&otp->iak_id_zero_bits);

platform/ext/common/provisioning.c

diff --git a/platform/ext/common/provisioning.c b/platform/ext/common/provisioning.c
index 8b6c3e7..358d772 100644
--- a/platform/ext/common/provisioning.c
+++ b/platform/ext/common/provisioning.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include "config_attest.h"
 #include "tfm_plat_provisioning.h"
 
 #include "cmsis_compiler.h"
@@ -90,11 +91,11 @@
     /* verification_service_url */
     "www.trustedfirmware.org",
     /* attestation_profile_definition */
-#if defined(ATTEST_TOKEN_PROFILE_PSA_IOT_1)
+#if ATTEST_TOKEN_PROFILE_PSA_IOT_1
     "PSA_IOT_PROFILE_1",
-#elif defined(ATTEST_TOKEN_PROFILE_PSA_2_0_0)
+#elif ATTEST_TOKEN_PROFILE_PSA_2_0_0
     "http://arm.com/psa/2.0.0",
-#elif defined(ATTEST_TOKEN_PROFILE_ARM_CCA)
+#elif ATTEST_TOKEN_PROFILE_ARM_CCA
     "http://arm.com/CCA-SSD/1.0.0",
 #else
 #ifdef TFM_PARTITION_INITIAL_ATTESTATION
@@ -195,7 +196,7 @@
         return err;
     }
 
-#ifdef ATTEST_INCLUDE_COSE_KEY_ID
+#if ATTEST_INCLUDE_COSE_KEY_ID
     err = tfm_plat_otp_write(PLAT_OTP_ID_IAK_ID,
                              sizeof(psa_rot_prov_data.iak_id),
                              psa_rot_prov_data.iak_id);

platform/ext/target/arm/rss/common/provisioning.c

diff --git a/platform/ext/target/arm/rss/common/provisioning.c b/platform/ext/target/arm/rss/common/provisioning.c
index ebcfd82..a861782 100644
--- a/platform/ext/target/arm/rss/common/provisioning.c
+++ b/platform/ext/target/arm/rss/common/provisioning.c
@@ -8,6 +8,7 @@
 #include "tfm_plat_provisioning.h"
 
 #include "cmsis_compiler.h"
+#include "config_attest.h"
 #include "tfm_plat_otp.h"
 #include "tfm_attest_hal.h"
 #include "psa/crypto.h"
@@ -115,11 +116,11 @@
     /* verification_service_url */
     "www.trustedfirmware.org",
     /* attestation_profile_definition */
-#if defined(ATTEST_TOKEN_PROFILE_PSA_IOT_1)
+#if ATTEST_TOKEN_PROFILE_PSA_IOT_1
     "PSA_IOT_PROFILE_1",
-#elif defined(ATTEST_TOKEN_PROFILE_PSA_2_0_0)
+#elif ATTEST_TOKEN_PROFILE_PSA_2_0_0
     "http://arm.com/psa/2.0.0",
-#elif defined(ATTEST_TOKEN_PROFILE_ARM_CCA)
+#elif ATTEST_TOKEN_PROFILE_ARM_CCA
     "http://arm.com/CCA-SSD/1.0.0",
 #else
 #ifdef TFM_PARTITION_INITIAL_ATTESTATION