diff options
| author | Louis Mayencourt <louis.mayencourt@arm.com> | 2020-06-11 21:15:15 +0100 |
|---|---|---|
| committer | Manish V Badarkhe <Manish.Badarkhe@arm.com> | 2020-06-24 08:44:26 +0100 |
| commit | 243875eaf9df591aec14c20075c70cb5af7dd9e9 (patch) | |
| tree | 27078b2290a74d0bf1dc91eede38bd5d8f56592e /include | |
| parent | 9b3ca9b120b2bd4ea15114872aba06229422770e (diff) | |
| download | platform_external_arm-trusted-firmware-243875eaf9df591aec14c20075c70cb5af7dd9e9.tar.gz platform_external_arm-trusted-firmware-243875eaf9df591aec14c20075c70cb5af7dd9e9.tar.bz2 platform_external_arm-trusted-firmware-243875eaf9df591aec14c20075c70cb5af7dd9e9.zip | |
tbbr/dualroot: Add fw_config image in chain of trust
fw_config image is authenticated using secure boot framework by
adding it into the single root and dual root chain of trust.
The COT for fw_config image looks as below:
+------------------+ +-------------------+
| ROTPK/ROTPK Hash |------>| Trusted Boot fw |
+------------------+ | Certificate |
| (Auth Image) |
/+-------------------+
/ |
/ |
/ |
/ |
L v
+------------------+ +-------------------+
| fw_config hash |------>| fw_config |
| | | (Data Image) |
+------------------+ +-------------------+
Signed-off-by: Louis Mayencourt <louis.mayencourt@arm.com>
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
Change-Id: I08fc8ee95c29a95bb140c807dd06e772474c7367
Diffstat (limited to 'include')
| -rw-r--r-- | include/drivers/auth/tbbr_cot_common.h | 4 | ||||
| -rw-r--r-- | include/export/common/tbbr/tbbr_img_def_exp.h | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/include/drivers/auth/tbbr_cot_common.h b/include/drivers/auth/tbbr_cot_common.h index 0ea5f6575..a51faee1a 100644 --- a/include/drivers/auth/tbbr_cot_common.h +++ b/include/drivers/auth/tbbr_cot_common.h @@ -10,8 +10,6 @@ #include <drivers/auth/auth_mod.h> extern unsigned char tb_fw_hash_buf[HASH_DER_LEN]; -extern unsigned char tb_fw_config_hash_buf[HASH_DER_LEN]; -extern unsigned char hw_config_hash_buf[HASH_DER_LEN]; extern unsigned char scp_fw_hash_buf[HASH_DER_LEN]; extern unsigned char nt_world_bl_hash_buf[HASH_DER_LEN]; @@ -23,7 +21,7 @@ extern auth_param_type_desc_t raw_data; extern auth_param_type_desc_t tb_fw_hash; extern auth_param_type_desc_t tb_fw_config_hash; -extern auth_param_type_desc_t hw_config_hash; +extern auth_param_type_desc_t fw_config_hash; extern const auth_img_desc_t trusted_boot_fw_cert; extern const auth_img_desc_t hw_config; diff --git a/include/export/common/tbbr/tbbr_img_def_exp.h b/include/export/common/tbbr/tbbr_img_def_exp.h index a98c1b4f6..18f012513 100644 --- a/include/export/common/tbbr/tbbr_img_def_exp.h +++ b/include/export/common/tbbr/tbbr_img_def_exp.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2019-2020, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -88,7 +88,10 @@ /* Encrypted image identifier */ #define ENC_IMAGE_ID U(30) +/* FW_CONFIG */ +#define FW_CONFIG_ID U(31) + /* Max Images */ -#define MAX_IMAGE_IDS U(31) +#define MAX_IMAGE_IDS U(32) #endif /* ARM_TRUSTED_FIRMWARE_EXPORT_COMMON_TBBR_TBBR_IMG_DEF_EXP_H */ |