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

feat(fvp): add public key-OID information in RSS metadata structure

Browse source 
Added public key-OID information in the RSS metadata structure.

Change-Id: I5ee5d41519980091296deaa1882fdfe9ae6766c0
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>
This commit is contained in:
Manish V Badarkhe 2023-04-11 14:46:10 +01:00
parent 0cffcdd617
commit bfbb1cbaac
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@
#include <drivers/measured_boot/event_log/event_log.h> #include <drivers/measured_boot/event_log/event_log.h>
#include <drivers/measured_boot/rss/rss_measured_boot.h> #include <drivers/measured_boot/rss/rss_measured_boot.h>
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
#include <tools_share/zero_oid.h>
/* Event Log data */ /* Event Log data */
static uint8_t event_log[PLAT_ARM_EVENT_LOG_MAX_SIZE]; static uint8_t event_log[PLAT_ARM_EVENT_LOG_MAX_SIZE];
@ -31,18 +32,21 @@ struct rss_mboot_metadata fvp_rss_mboot_metadata[] = {
.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 = RSS_MBOOT_FW_CONFIG_STRING,
.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 = RSS_MBOOT_TB_FW_CONFIG_STRING,
.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 = RSS_MBOOT_BL2_STRING,
.pk_oid = ZERO_OID,
.lock_measurement = true }, .lock_measurement = true },
{ {

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

@ -9,7 +9,11 @@
#include <common/tbbr/tbbr_img_def.h> #include <common/tbbr/tbbr_img_def.h>
#include <drivers/measured_boot/event_log/event_log.h> #include <drivers/measured_boot/event_log/event_log.h>
#include <drivers/measured_boot/rss/rss_measured_boot.h> #include <drivers/measured_boot/rss/rss_measured_boot.h>
#if defined(ARM_COT_cca)
#include <tools_share/cca_oid.h>
#else
#include <tools_share/tbbr_oid.h> #include <tools_share/tbbr_oid.h>
#endif /* ARM_COT_cca */
#include <fvp_critical_data.h> #include <fvp_critical_data.h>
#include <plat/arm/common/plat_arm.h> #include <plat/arm/common/plat_arm.h>
@ -62,25 +66,31 @@ struct rss_mboot_metadata fvp_rss_mboot_metadata[] = {
.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 = RSS_MBOOT_BL31_STRING,
.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 = RSS_MBOOT_HW_CONFIG_STRING,
.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 = RSS_MBOOT_SOC_FW_CONFIG_STRING,
.pk_oid = SOC_FW_CONFIG_KEY_OID,
.lock_measurement = true }, .lock_measurement = true },
#if ENABLE_RME
{ {
.id = RMM_IMAGE_ID, .id = RMM_IMAGE_ID,
.slot = U(12), .slot = U(12),
.signer_id_size = SIGNER_ID_MIN_SIZE, .signer_id_size = SIGNER_ID_MIN_SIZE,
.sw_type = RSS_MBOOT_RMM_STRING, .sw_type = RSS_MBOOT_RMM_STRING,
.pk_oid = RMM_IMAGE_KEY_OID,
.lock_measurement = true }, .lock_measurement = true },
#endif /* ENABLE_RME */
{ {
.id = RSS_MBOOT_INVALID_ID } .id = RSS_MBOOT_INVALID_ID }
}; };