mirrors/arm-trusted-firmware
0
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2024-11-30 13:25:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tc): align image identifier string macros

Browse Source 
Macros were renamed, align with new names.

Signed-off-by: Tamas Ban <tamas.ban@arm.com>
Change-Id: Id7a556da34381618577fed4039d9ca957754cd7c
This commit is contained in:
Tamas Ban 2023-06-05 11:13:16 +02:00
parent 09bb42dbd4
commit 24844d8b71
3 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/drivers/measured_boot/rss/rss_measured_boot.h
View File

@ -14,23 +14,6 @@
#define RSS_MBOOT_INVALID_ID UINT32_MAX #define RSS_MBOOT_INVALID_ID UINT32_MAX
/*
* Each boot measurement has some metadata (i.e. a string) that identifies
* what was measured and how. The sw_type field of the rss_mboot_metadata
* structure represents the role of the software component that was measured.
* The below macros define strings suitable for the sw_type.
* The key thing is to choose meaningful strings so that when the attestation
* token is verified, then the different components can be identified.
*/
#define RSS_MBOOT_BL2_STRING "BL_2"
#define RSS_MBOOT_BL31_STRING "SECURE_RT_EL3"
#define RSS_MBOOT_HW_CONFIG_STRING "HW_CONFIG"
#define RSS_MBOOT_FW_CONFIG_STRING "FW_CONFIG"
#define RSS_MBOOT_TB_FW_CONFIG_STRING "TB_FW_CONFIG"
#define RSS_MBOOT_SOC_FW_CONFIG_STRING "SOC_FW_CONFIG"
#define RSS_MBOOT_RMM_STRING "RMM"
struct rss_mboot_metadata { struct rss_mboot_metadata {
unsigned int id; unsigned int id;
uint8_t slot; uint8_t slot;

10
plat/arm/board/tc/tc_bl1_measured_boot.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022-2023, Arm Limited. All rights reserved. * Copyright (c) 2022-2024, Arm Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,8 +7,8 @@
#include <stdint.h> #include <stdint.h>
#include <drivers/arm/rss_comms.h> #include <drivers/arm/rss_comms.h>
#include <drivers/measured_boot/metadata.h>
#include <drivers/measured_boot/rss/rss_measured_boot.h> #include <drivers/measured_boot/rss/rss_measured_boot.h>
#include <lib/psa/measured_boot.h>
#include <tools_share/zero_oid.h> #include <tools_share/zero_oid.h>
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
@ -22,21 +22,21 @@ struct rss_mboot_metadata tc_rss_mboot_metadata[] = {
.id = FW_CONFIG_ID, .id = FW_CONFIG_ID,
.slot = U(6), .slot = U(6),
.signer_id_size = SIGNER_ID_MIN_SIZE, .signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_FW_CONFIG_STRING, .sw_type = MBOOT_FW_CONFIG_STRING,
.pk_oid = ZERO_OID, .pk_oid = ZERO_OID,
.lock_measurement = true }, .lock_measurement = true },
{ {
.id = TB_FW_CONFIG_ID, .id = TB_FW_CONFIG_ID,
.slot = U(7), .slot = U(7),
.signer_id_size = SIGNER_ID_MIN_SIZE, .signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_TB_FW_CONFIG_STRING, .sw_type = MBOOT_TB_FW_CONFIG_STRING,
.pk_oid = ZERO_OID, .pk_oid = ZERO_OID,
.lock_measurement = true }, .lock_measurement = true },
{ {
.id = BL2_IMAGE_ID, .id = BL2_IMAGE_ID,
.slot = U(8), .slot = U(8),
.signer_id_size = SIGNER_ID_MIN_SIZE, .signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_BL2_STRING, .sw_type = MBOOT_BL2_IMAGE_STRING,
.pk_oid = ZERO_OID, .pk_oid = ZERO_OID,
.lock_measurement = true }, .lock_measurement = true },

10
plat/arm/board/tc/tc_bl2_measured_boot.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2022-2023, Arm Limited. All rights reserved. * Copyright (c) 2022-2024, Arm Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -7,8 +7,8 @@
#include <stdint.h> #include <stdint.h>
#include <drivers/arm/rss_comms.h> #include <drivers/arm/rss_comms.h>
#include <drivers/measured_boot/metadata.h>
#include <drivers/measured_boot/rss/rss_measured_boot.h> #include <drivers/measured_boot/rss/rss_measured_boot.h>
#include <lib/psa/measured_boot.h>
#include <tools_share/tbbr_oid.h> #include <tools_share/tbbr_oid.h>
#include <plat/common/common_def.h> #include <plat/common/common_def.h>
@ -22,21 +22,21 @@ struct rss_mboot_metadata tc_rss_mboot_metadata[] = {
.id = BL31_IMAGE_ID, .id = BL31_IMAGE_ID,
.slot = U(9), .slot = U(9),
.signer_id_size = SIGNER_ID_MIN_SIZE, .signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_BL31_STRING, .sw_type = MBOOT_BL31_IMAGE_STRING,
.pk_oid = BL31_IMAGE_KEY_OID, .pk_oid = BL31_IMAGE_KEY_OID,
.lock_measurement = true }, .lock_measurement = true },
{ {
.id = HW_CONFIG_ID, .id = HW_CONFIG_ID,
.slot = U(10), .slot = U(10),
.signer_id_size = SIGNER_ID_MIN_SIZE, .signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_HW_CONFIG_STRING, .sw_type = MBOOT_HW_CONFIG_STRING,
.pk_oid = HW_CONFIG_KEY_OID, .pk_oid = HW_CONFIG_KEY_OID,
.lock_measurement = true }, .lock_measurement = true },
{ {
.id = SOC_FW_CONFIG_ID, .id = SOC_FW_CONFIG_ID,
.slot = U(11), .slot = U(11),
.signer_id_size = SIGNER_ID_MIN_SIZE, .signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_SOC_FW_CONFIG_STRING, .sw_type = MBOOT_SOC_FW_CONFIG_STRING,
.pk_oid = SOC_FW_CONFIG_KEY_OID, .pk_oid = SOC_FW_CONFIG_KEY_OID,
.lock_measurement = true }, .lock_measurement = true },
{ {