commit abea89dd47fcc8a964559628b80607f9fa44a97c
author Tamas Ban <tamas.ban@arm.com> Wed Jan 15 13:29:25 2020 +0000
committer Tamas Ban <tamas.ban@arm.com> Thu Jan 23 13:33:03 2020 +0000
tree 50c9d23f0f50e21b5558131d7d651621740e1812
parent e66b2316c9ae4eeed24943f4c050acb5d0a95a7f

Attest: Refine compile time build options

To have more granular config options for attestation
separate the test code and COSE key-id inclusion to be
dependent on different compile time options.

Change-Id: I351ce445f7beacf3378bbec4f740923bcd352f90
Signed-off-by: Tamas Ban <tamas.ban@arm.com>

lib/ext/t_cose/CMakeLists.txt

diff --git a/lib/ext/t_cose/CMakeLists.txt b/lib/ext/t_cose/CMakeLists.txt
index 7ff82e5..540da91 100644
--- a/lib/ext/t_cose/CMakeLists.txt
+++ b/lib/ext/t_cose/CMakeLists.txt
@@ -22,8 +22,8 @@
 project(tfm_t_cose LANGUAGES C)
 embedded_project_fixup()
 
-if (NOT DEFINED ATTEST_INCLUDE_TEST_CODE_AND_KEY_ID)
-	message(FATAL_ERROR "Incomplete build configuration: ATTEST_INCLUDE_TEST_CODE_AND_KEY_ID is undefined. ")
+if (NOT DEFINED ATTEST_INCLUDE_TEST_CODE)
+	message(FATAL_ERROR "Incomplete build configuration: ATTEST_INCLUDE_TEST_CODE is undefined. ")
 endif()
 
 #Append all our source files to global lists.
@@ -71,7 +71,7 @@
 	"T_COSE_DISABLE_SIGN_VERIFY_TESTS"
 	)
 
-if (NOT ATTEST_INCLUDE_TEST_CODE_AND_KEY_ID)
+if (NOT ATTEST_INCLUDE_TEST_CODE)
 	list(APPEND T_COSE_COMPILE_TIME_CONFIG "T_COSE_DISABLE_SHORT_CIRCUIT_SIGN")
 endif()