Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-27 15:24:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "refactor(measured boot): rename a macro INVALID_ID to EVLOG_INVALID_ID" into integration

Browse source
This commit is contained in:
Sandrine Bailleux 2021-12-08 08:16:53 +01:00 • committed by TrustedFirmware Code Review
commit 0628fe3fff
4 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/measured_boot/event_log/event_log.c
View file

@ -250,11 +250,11 @@ int event_log_measure_and_record(uintptr_t data_base, uint32_t data_size,
const event_log_metadata_t *metadata_ptr = plat_metadata_ptr; const event_log_metadata_t *metadata_ptr = plat_metadata_ptr;
/* Get the metadata associated with this image. */ /* Get the metadata associated with this image. */
while ((metadata_ptr->id != INVALID_ID) && while ((metadata_ptr->id != EVLOG_INVALID_ID) &&
(metadata_ptr->id != data_id)) { (metadata_ptr->id != data_id)) {
metadata_ptr++; metadata_ptr++;
} }
assert(metadata_ptr->id != INVALID_ID); assert(metadata_ptr->id != EVLOG_INVALID_ID);
/* Calculate hash */ /* Calculate hash */
rc = crypto_mod_calc_hash((unsigned int)MBEDTLS_MD_ID, rc = crypto_mod_calc_hash((unsigned int)MBEDTLS_MD_ID,

2
include/drivers/measured_boot/event_log/event_log.h
View file

@ -38,7 +38,7 @@
/* Number of hashing algorithms supported */ /* Number of hashing algorithms supported */
#define HASH_ALG_COUNT 1U #define HASH_ALG_COUNT 1U
#define INVALID_ID MAX_NUMBER_IDS #define EVLOG_INVALID_ID MAX_NUMBER_IDS
#define MEMBER_SIZE(type, member) sizeof(((type *)0)->member) #define MEMBER_SIZE(type, member) sizeof(((type *)0)->member)

3
plat/arm/board/fvp/fvp_bl1_measured_boot.c
View file

@ -17,7 +17,8 @@ const event_log_metadata_t fvp_event_log_metadata[] = {
{ FW_CONFIG_ID, EVLOG_FW_CONFIG_STRING, PCR_0 }, { FW_CONFIG_ID, EVLOG_FW_CONFIG_STRING, PCR_0 },
{ TB_FW_CONFIG_ID, EVLOG_TB_FW_CONFIG_STRING, PCR_0 }, { TB_FW_CONFIG_ID, EVLOG_TB_FW_CONFIG_STRING, PCR_0 },
{ BL2_IMAGE_ID, EVLOG_BL2_STRING, PCR_0 }, { BL2_IMAGE_ID, EVLOG_BL2_STRING, PCR_0 },
{ INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */
{ EVLOG_INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */
}; };
void bl1_plat_mboot_init(void) void bl1_plat_mboot_init(void)

3
plat/arm/board/fvp/fvp_bl2_measured_boot.c
View file

@ -24,7 +24,8 @@ const event_log_metadata_t fvp_event_log_metadata[] = {
{ SCP_BL2_IMAGE_ID, EVLOG_SCP_BL2_STRING, PCR_0 }, { SCP_BL2_IMAGE_ID, EVLOG_SCP_BL2_STRING, PCR_0 },
{ SOC_FW_CONFIG_ID, EVLOG_SOC_FW_CONFIG_STRING, PCR_0 }, { SOC_FW_CONFIG_ID, EVLOG_SOC_FW_CONFIG_STRING, PCR_0 },
{ TOS_FW_CONFIG_ID, EVLOG_TOS_FW_CONFIG_STRING, PCR_0 }, { TOS_FW_CONFIG_ID, EVLOG_TOS_FW_CONFIG_STRING, PCR_0 },
{ INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */
{ EVLOG_INVALID_ID, NULL, (unsigned int)(-1) } /* Terminator */
}; };
void bl2_plat_mboot_init(void) void bl2_plat_mboot_init(void)