mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-19 02:54:24 +00:00
refactor(auth): separate bl1 and bl2 CoT
Separate the bl1 and bl2 CoT into individual C files for the upcoming tool, i.e. the CoT device tree-to-source file generator. Change-Id: I0d24791991b3539c7aef9a562920dc62fecdc69a Signed-off-by: Xialin Liu <Xialin.Liu@ARM.com>
This commit is contained in:
Xialin Liu
Manish V Badarkhe
parent
b6a95c4a80
commit
3146a70af2
5 changed files with 403 additions and 300 deletions
145
drivers/auth/cca/bl1_cot.c
Normal file
145
drivers/auth/cca/bl1_cot.c
Normal file
|
|
@ -0,0 +1,145 @@
|
|||
/*
|
||||
* Copyright (c) 2022-2024, Arm Limited. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#include <mbedtls/version.h>
|
||||
|
||||
#include <common/tbbr/cot_def.h>
|
||||
#include <drivers/auth/auth_mod.h>
|
||||
#include <platform_def.h>
|
||||
#include <tools_share/cca_oid.h>
|
||||
|
||||
/*
|
||||
* Allocate static buffers to store the authentication parameters extracted from
|
||||
* the certificates.
|
||||
*/
|
||||
static unsigned char fw_config_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char tb_fw_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char tb_fw_config_hash_buf[HASH_DER_LEN];
|
||||
|
||||
/*
|
||||
* Parameter type descriptors.
|
||||
*/
|
||||
static auth_param_type_desc_t cca_nv_ctr = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_NV_CTR, CCA_FW_NVCOUNTER_OID);
|
||||
static auth_param_type_desc_t subject_pk = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_PUB_KEY, 0);
|
||||
static auth_param_type_desc_t sig = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_SIG, 0);
|
||||
static auth_param_type_desc_t sig_alg = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_SIG_ALG, 0);
|
||||
static auth_param_type_desc_t raw_data = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_RAW_DATA, 0);
|
||||
|
||||
static auth_param_type_desc_t tb_fw_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, TRUSTED_BOOT_FW_HASH_OID);
|
||||
static auth_param_type_desc_t tb_fw_config_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, TRUSTED_BOOT_FW_CONFIG_HASH_OID);
|
||||
static auth_param_type_desc_t fw_config_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, FW_CONFIG_HASH_OID);
|
||||
|
||||
/* CCA Content Certificate */
|
||||
static const auth_img_desc_t cca_content_cert = {
|
||||
.img_id = CCA_CONTENT_CERT_ID,
|
||||
.img_type = IMG_CERT,
|
||||
.parent = NULL,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_SIG,
|
||||
.param.sig = {
|
||||
.pk = &subject_pk,
|
||||
.sig = &sig,
|
||||
.alg = &sig_alg,
|
||||
.data = &raw_data
|
||||
}
|
||||
},
|
||||
[1] = {
|
||||
.type = AUTH_METHOD_NV_CTR,
|
||||
.param.nv_ctr = {
|
||||
.cert_nv_ctr = &cca_nv_ctr,
|
||||
.plat_nv_ctr = &cca_nv_ctr
|
||||
}
|
||||
}
|
||||
},
|
||||
.authenticated_data = (const auth_param_desc_t[COT_MAX_VERIFIED_PARAMS]) {
|
||||
[0] = {
|
||||
.type_desc = &tb_fw_hash,
|
||||
.data = {
|
||||
.ptr = (void *)tb_fw_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[1] = {
|
||||
.type_desc = &tb_fw_config_hash,
|
||||
.data = {
|
||||
.ptr = (void *)tb_fw_config_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[2] = {
|
||||
.type_desc = &fw_config_hash,
|
||||
.data = {
|
||||
.ptr = (void *)fw_config_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static const auth_img_desc_t bl2_image = {
|
||||
.img_id = BL2_IMAGE_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &cca_content_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &tb_fw_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static const auth_img_desc_t tb_fw_config = {
|
||||
.img_id = TB_FW_CONFIG_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &cca_content_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &tb_fw_config_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static const auth_img_desc_t fw_config = {
|
||||
.img_id = FW_CONFIG_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &cca_content_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &fw_config_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static const auth_img_desc_t * const cot_desc[] = {
|
||||
[CCA_CONTENT_CERT_ID] = &cca_content_cert,
|
||||
[BL2_IMAGE_ID] = &bl2_image,
|
||||
[TB_FW_CONFIG_ID] = &tb_fw_config,
|
||||
[FW_CONFIG_ID] = &fw_config,
|
||||
};
|
||||
|
||||
REGISTER_COT(cot_desc);
|
||||
|
|
@ -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
|
||||
*/
|
||||
|
|
@ -18,15 +18,11 @@
|
|||
* Allocate static buffers to store the authentication parameters extracted from
|
||||
* the certificates.
|
||||
*/
|
||||
static unsigned char fw_config_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char tb_fw_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char tb_fw_config_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char hw_config_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char soc_fw_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char soc_fw_config_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char rmm_hash_buf[HASH_DER_LEN];
|
||||
|
||||
#ifdef IMAGE_BL2
|
||||
static unsigned char nt_world_bl_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char tos_fw_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char tos_fw_config_hash_buf[HASH_DER_LEN];
|
||||
|
|
@ -37,7 +33,6 @@ static unsigned char sp_pkg_hash_buf[MAX_SP_IDS][HASH_DER_LEN];
|
|||
|
||||
static unsigned char core_swd_pk_buf[PK_DER_LEN];
|
||||
static unsigned char plat_pk_buf[PK_DER_LEN];
|
||||
#endif /* IMAGE_BL2 */
|
||||
|
||||
/*
|
||||
* Parameter type descriptors.
|
||||
|
|
@ -53,14 +48,8 @@ static auth_param_type_desc_t sig_alg = AUTH_PARAM_TYPE_DESC(
|
|||
static auth_param_type_desc_t raw_data = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_RAW_DATA, 0);
|
||||
|
||||
static auth_param_type_desc_t tb_fw_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, TRUSTED_BOOT_FW_HASH_OID);
|
||||
static auth_param_type_desc_t tb_fw_config_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, TRUSTED_BOOT_FW_CONFIG_HASH_OID);
|
||||
static auth_param_type_desc_t hw_config_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, HW_CONFIG_HASH_OID);
|
||||
static auth_param_type_desc_t fw_config_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, FW_CONFIG_HASH_OID);
|
||||
static auth_param_type_desc_t soc_fw_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, SOC_AP_FW_HASH_OID);
|
||||
static auth_param_type_desc_t soc_fw_config_hash = AUTH_PARAM_TYPE_DESC(
|
||||
|
|
@ -68,7 +57,6 @@ static auth_param_type_desc_t soc_fw_config_hash = AUTH_PARAM_TYPE_DESC(
|
|||
static auth_param_type_desc_t rmm_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, RMM_HASH_OID);
|
||||
|
||||
#ifdef IMAGE_BL2
|
||||
static auth_param_type_desc_t trusted_nv_ctr = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_NV_CTR, TRUSTED_FW_NVCOUNTER_OID);
|
||||
static auth_param_type_desc_t non_trusted_nv_ctr = AUTH_PARAM_TYPE_DESC(
|
||||
|
|
@ -109,7 +97,6 @@ static auth_param_type_desc_t sp_pkg7_hash = AUTH_PARAM_TYPE_DESC(
|
|||
static auth_param_type_desc_t sp_pkg8_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, SP_PKG8_HASH_OID);
|
||||
#endif /* SPD_spmd */
|
||||
#endif /* IMAGE_BL2 */
|
||||
|
||||
/* CCA Content Certificate */
|
||||
static const auth_img_desc_t cca_content_cert = {
|
||||
|
|
@ -136,48 +123,27 @@ static const auth_img_desc_t cca_content_cert = {
|
|||
},
|
||||
.authenticated_data = (const auth_param_desc_t[COT_MAX_VERIFIED_PARAMS]) {
|
||||
[0] = {
|
||||
.type_desc = &tb_fw_hash,
|
||||
.data = {
|
||||
.ptr = (void *)tb_fw_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[1] = {
|
||||
.type_desc = &tb_fw_config_hash,
|
||||
.data = {
|
||||
.ptr = (void *)tb_fw_config_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[2] = {
|
||||
.type_desc = &fw_config_hash,
|
||||
.data = {
|
||||
.ptr = (void *)fw_config_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[3] = {
|
||||
.type_desc = &hw_config_hash,
|
||||
.data = {
|
||||
.ptr = (void *)hw_config_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[4] = {
|
||||
[1] = {
|
||||
.type_desc = &soc_fw_hash,
|
||||
.data = {
|
||||
.ptr = (void *)soc_fw_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[5] = {
|
||||
[2] = {
|
||||
.type_desc = &soc_fw_config_hash,
|
||||
.data = {
|
||||
.ptr = (void *)soc_fw_config_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[6] = {
|
||||
[3] = {
|
||||
.type_desc = &rmm_hash,
|
||||
.data = {
|
||||
.ptr = (void *)rmm_hash_buf,
|
||||
|
|
@ -187,54 +153,7 @@ static const auth_img_desc_t cca_content_cert = {
|
|||
}
|
||||
};
|
||||
|
||||
#ifdef IMAGE_BL1
|
||||
static const auth_img_desc_t bl2_image = {
|
||||
.img_id = BL2_IMAGE_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &cca_content_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &tb_fw_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static const auth_img_desc_t tb_fw_config = {
|
||||
.img_id = TB_FW_CONFIG_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &cca_content_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &tb_fw_config_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static const auth_img_desc_t fw_config = {
|
||||
.img_id = FW_CONFIG_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &cca_content_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &fw_config_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
#endif /* IMAGE_BL1 */
|
||||
|
||||
#ifdef IMAGE_BL2
|
||||
/* HW Config */
|
||||
static const auth_img_desc_t hw_config = {
|
||||
.img_id = HW_CONFIG_ID,
|
||||
|
|
@ -634,18 +553,11 @@ DEFINE_PLAT_SP_PKG(6);
|
|||
DEFINE_PLAT_SP_PKG(7);
|
||||
DEFINE_PLAT_SP_PKG(8);
|
||||
#endif /* SPD_spmd */
|
||||
#endif /* IMAGE_BL2 */
|
||||
|
||||
/*
|
||||
* Chain of trust definition
|
||||
*/
|
||||
#ifdef IMAGE_BL1
|
||||
static const auth_img_desc_t * const cot_desc[] = {
|
||||
[CCA_CONTENT_CERT_ID] = &cca_content_cert,
|
||||
[BL2_IMAGE_ID] = &bl2_image,
|
||||
[TB_FW_CONFIG_ID] = &tb_fw_config,
|
||||
[FW_CONFIG_ID] = &fw_config,
|
||||
};
|
||||
#else /* IMAGE_BL2 */
|
||||
|
||||
static const auth_img_desc_t * const cot_desc[] = {
|
||||
[CCA_CONTENT_CERT_ID] = &cca_content_cert,
|
||||
[HW_CONFIG_ID] = &hw_config,
|
||||
|
|
@ -673,7 +585,6 @@ static const auth_img_desc_t * const cot_desc[] = {
|
|||
[SP_PKG8_ID] = &sp_pkg8,
|
||||
#endif
|
||||
};
|
||||
#endif /* IMAGE_BL1 */
|
||||
|
||||
/* Register the CoT in the authentication module */
|
||||
REGISTER_COT(cot_desc);
|
||||
246
drivers/auth/dualroot/bl1_cot.c
Normal file
246
drivers/auth/dualroot/bl1_cot.c
Normal file
|
|
@ -0,0 +1,246 @@
|
|||
/*
|
||||
* Copyright (c) 2020-2024, Arm Limited. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#include <mbedtls/version.h>
|
||||
|
||||
#include <common/tbbr/cot_def.h>
|
||||
#include <drivers/auth/auth_mod.h>
|
||||
#include <platform_def.h>
|
||||
#include <tools_share/dualroot_oid.h>
|
||||
|
||||
/*
|
||||
* Allocate static buffers to store the authentication parameters extracted from
|
||||
* the certificates.
|
||||
*/
|
||||
static unsigned char fw_config_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char tb_fw_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char tb_fw_config_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char scp_fw_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char nt_world_bl_hash_buf[HASH_DER_LEN];
|
||||
|
||||
/*
|
||||
* Parameter type descriptors.
|
||||
*/
|
||||
static auth_param_type_desc_t trusted_nv_ctr = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_NV_CTR, TRUSTED_FW_NVCOUNTER_OID);
|
||||
static auth_param_type_desc_t subject_pk = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_PUB_KEY, 0);
|
||||
static auth_param_type_desc_t sig = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_SIG, 0);
|
||||
static auth_param_type_desc_t sig_alg = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_SIG_ALG, 0);
|
||||
static auth_param_type_desc_t raw_data = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_RAW_DATA, 0);
|
||||
|
||||
static auth_param_type_desc_t tb_fw_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, TRUSTED_BOOT_FW_HASH_OID);
|
||||
static auth_param_type_desc_t tb_fw_config_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, TRUSTED_BOOT_FW_CONFIG_HASH_OID);
|
||||
static auth_param_type_desc_t fw_config_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, FW_CONFIG_HASH_OID);
|
||||
static auth_param_type_desc_t scp_bl2u_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, SCP_FWU_CFG_HASH_OID);
|
||||
static auth_param_type_desc_t bl2u_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, AP_FWU_CFG_HASH_OID);
|
||||
static auth_param_type_desc_t ns_bl2u_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, FWU_HASH_OID);
|
||||
|
||||
static const auth_img_desc_t trusted_boot_fw_cert = {
|
||||
.img_id = TRUSTED_BOOT_FW_CERT_ID,
|
||||
.img_type = IMG_CERT,
|
||||
.parent = NULL,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_SIG,
|
||||
.param.sig = {
|
||||
.pk = &subject_pk,
|
||||
.sig = &sig,
|
||||
.alg = &sig_alg,
|
||||
.data = &raw_data
|
||||
}
|
||||
},
|
||||
[1] = {
|
||||
.type = AUTH_METHOD_NV_CTR,
|
||||
.param.nv_ctr = {
|
||||
.cert_nv_ctr = &trusted_nv_ctr,
|
||||
.plat_nv_ctr = &trusted_nv_ctr
|
||||
}
|
||||
}
|
||||
},
|
||||
.authenticated_data = (const auth_param_desc_t[COT_MAX_VERIFIED_PARAMS]) {
|
||||
[0] = {
|
||||
.type_desc = &tb_fw_hash,
|
||||
.data = {
|
||||
.ptr = (void *)tb_fw_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[1] = {
|
||||
.type_desc = &tb_fw_config_hash,
|
||||
.data = {
|
||||
.ptr = (void *)tb_fw_config_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[2] = {
|
||||
.type_desc = &fw_config_hash,
|
||||
.data = {
|
||||
.ptr = (void *)fw_config_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static const auth_img_desc_t bl2_image = {
|
||||
.img_id = BL2_IMAGE_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &trusted_boot_fw_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &tb_fw_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/* TB FW Config */
|
||||
static const auth_img_desc_t tb_fw_config = {
|
||||
.img_id = TB_FW_CONFIG_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &trusted_boot_fw_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &tb_fw_config_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static const auth_img_desc_t fw_config = {
|
||||
.img_id = FW_CONFIG_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &trusted_boot_fw_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &fw_config_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/* FWU auth descriptor */
|
||||
static const auth_img_desc_t fwu_cert = {
|
||||
.img_id = FWU_CERT_ID,
|
||||
.img_type = IMG_CERT,
|
||||
.parent = NULL,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_SIG,
|
||||
.param.sig = {
|
||||
.pk = &subject_pk,
|
||||
.sig = &sig,
|
||||
.alg = &sig_alg,
|
||||
.data = &raw_data
|
||||
}
|
||||
}
|
||||
},
|
||||
.authenticated_data = (const auth_param_desc_t[COT_MAX_VERIFIED_PARAMS]) {
|
||||
[0] = {
|
||||
.type_desc = &scp_bl2u_hash,
|
||||
.data = {
|
||||
.ptr = (void *)scp_fw_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[1] = {
|
||||
.type_desc = &bl2u_hash,
|
||||
.data = {
|
||||
.ptr = (void *)tb_fw_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[2] = {
|
||||
.type_desc = &ns_bl2u_hash,
|
||||
.data = {
|
||||
.ptr = (void *)nt_world_bl_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/* SCP_BL2U */
|
||||
static const auth_img_desc_t scp_bl2u_image = {
|
||||
.img_id = SCP_BL2U_IMAGE_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &fwu_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &scp_bl2u_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/* BL2U */
|
||||
static const auth_img_desc_t bl2u_image = {
|
||||
.img_id = BL2U_IMAGE_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &fwu_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &bl2u_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/* NS_BL2U */
|
||||
static const auth_img_desc_t ns_bl2u_image = {
|
||||
.img_id = NS_BL2U_IMAGE_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &fwu_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &ns_bl2u_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static const auth_img_desc_t * const cot_desc[] = {
|
||||
[TRUSTED_BOOT_FW_CERT_ID] = &trusted_boot_fw_cert,
|
||||
[BL2_IMAGE_ID] = &bl2_image,
|
||||
[TB_FW_CONFIG_ID] = &tb_fw_config,
|
||||
[FW_CONFIG_ID] = &fw_config,
|
||||
[FWU_CERT_ID] = &fwu_cert,
|
||||
[SCP_BL2U_IMAGE_ID] = &scp_bl2u_image,
|
||||
[BL2U_IMAGE_ID] = &bl2u_image,
|
||||
[NS_BL2U_IMAGE_ID] = &ns_bl2u_image
|
||||
};
|
||||
|
||||
REGISTER_COT(cot_desc);
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2020-2023, Arm Limited. All rights reserved.
|
||||
* Copyright (c) 2020-2024, Arm Limited. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -19,14 +19,10 @@
|
|||
* Allocate static buffers to store the authentication parameters extracted from
|
||||
* the certificates.
|
||||
*/
|
||||
static unsigned char fw_config_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char tb_fw_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char tb_fw_config_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char hw_config_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char scp_fw_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char nt_world_bl_hash_buf[HASH_DER_LEN];
|
||||
|
||||
#ifdef IMAGE_BL2
|
||||
static unsigned char soc_fw_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char tos_fw_hash_buf[HASH_DER_LEN];
|
||||
static unsigned char tos_fw_extra1_hash_buf[HASH_DER_LEN];
|
||||
|
|
@ -40,7 +36,6 @@ static unsigned char sp_pkg_hash_buf[MAX_SP_IDS][HASH_DER_LEN];
|
|||
|
||||
static unsigned char trusted_world_pk_buf[PK_DER_LEN];
|
||||
static unsigned char content_pk_buf[PK_DER_LEN];
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Parameter type descriptors.
|
||||
|
|
@ -56,24 +51,10 @@ static auth_param_type_desc_t sig_alg = AUTH_PARAM_TYPE_DESC(
|
|||
static auth_param_type_desc_t raw_data = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_RAW_DATA, 0);
|
||||
|
||||
static auth_param_type_desc_t tb_fw_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, TRUSTED_BOOT_FW_HASH_OID);
|
||||
static auth_param_type_desc_t tb_fw_config_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, TRUSTED_BOOT_FW_CONFIG_HASH_OID);
|
||||
static auth_param_type_desc_t hw_config_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, HW_CONFIG_HASH_OID);
|
||||
static auth_param_type_desc_t fw_config_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, FW_CONFIG_HASH_OID);
|
||||
#ifdef IMAGE_BL1
|
||||
static auth_param_type_desc_t scp_bl2u_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, SCP_FWU_CFG_HASH_OID);
|
||||
static auth_param_type_desc_t bl2u_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, AP_FWU_CFG_HASH_OID);
|
||||
static auth_param_type_desc_t ns_bl2u_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, FWU_HASH_OID);
|
||||
#endif /* IMAGE_BL1 */
|
||||
|
||||
#ifdef IMAGE_BL2
|
||||
|
||||
static auth_param_type_desc_t non_trusted_nv_ctr = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_NV_CTR, NON_TRUSTED_FW_NVCOUNTER_OID);
|
||||
|
||||
|
|
@ -124,7 +105,6 @@ static auth_param_type_desc_t sp_pkg7_hash = AUTH_PARAM_TYPE_DESC(
|
|||
static auth_param_type_desc_t sp_pkg8_hash = AUTH_PARAM_TYPE_DESC(
|
||||
AUTH_PARAM_HASH, SP_PKG8_HASH_OID);
|
||||
#endif /* SPD_spmd */
|
||||
#endif /* IMAGE_BL2 */
|
||||
|
||||
|
||||
/* BL2 */
|
||||
|
|
@ -152,53 +132,15 @@ static const auth_img_desc_t trusted_boot_fw_cert = {
|
|||
},
|
||||
.authenticated_data = (const auth_param_desc_t[COT_MAX_VERIFIED_PARAMS]) {
|
||||
[0] = {
|
||||
.type_desc = &tb_fw_hash,
|
||||
.data = {
|
||||
.ptr = (void *)tb_fw_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[1] = {
|
||||
.type_desc = &tb_fw_config_hash,
|
||||
.data = {
|
||||
.ptr = (void *)tb_fw_config_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[2] = {
|
||||
.type_desc = &hw_config_hash,
|
||||
.data = {
|
||||
.ptr = (void *)hw_config_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[3] = {
|
||||
.type_desc = &fw_config_hash,
|
||||
.data = {
|
||||
.ptr = (void *)fw_config_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
#ifdef IMAGE_BL1
|
||||
static const auth_img_desc_t bl2_image = {
|
||||
.img_id = BL2_IMAGE_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &trusted_boot_fw_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &tb_fw_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
#endif /* IMAGE_BL1 */
|
||||
|
||||
/* HW Config */
|
||||
static const auth_img_desc_t hw_config = {
|
||||
.img_id = HW_CONFIG_ID,
|
||||
|
|
@ -215,41 +157,6 @@ static const auth_img_desc_t hw_config = {
|
|||
}
|
||||
};
|
||||
|
||||
/* TB FW Config */
|
||||
#ifdef IMAGE_BL1
|
||||
static const auth_img_desc_t tb_fw_config = {
|
||||
.img_id = TB_FW_CONFIG_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &trusted_boot_fw_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &tb_fw_config_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
static const auth_img_desc_t fw_config = {
|
||||
.img_id = FW_CONFIG_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &trusted_boot_fw_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &fw_config_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
#endif /* IMAGE_BL1 */
|
||||
|
||||
#ifdef IMAGE_BL2
|
||||
/* Trusted key certificate */
|
||||
static const auth_img_desc_t trusted_key_cert = {
|
||||
.img_id = TRUSTED_KEY_CERT_ID,
|
||||
|
|
@ -815,114 +722,9 @@ DEFINE_PLAT_SP_PKG(7);
|
|||
DEFINE_PLAT_SP_PKG(8);
|
||||
#endif /* SPD_spmd */
|
||||
|
||||
#else /* IMAGE_BL2 */
|
||||
|
||||
/* FWU auth descriptor */
|
||||
static const auth_img_desc_t fwu_cert = {
|
||||
.img_id = FWU_CERT_ID,
|
||||
.img_type = IMG_CERT,
|
||||
.parent = NULL,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_SIG,
|
||||
.param.sig = {
|
||||
.pk = &subject_pk,
|
||||
.sig = &sig,
|
||||
.alg = &sig_alg,
|
||||
.data = &raw_data
|
||||
}
|
||||
}
|
||||
},
|
||||
.authenticated_data = (const auth_param_desc_t[COT_MAX_VERIFIED_PARAMS]) {
|
||||
[0] = {
|
||||
.type_desc = &scp_bl2u_hash,
|
||||
.data = {
|
||||
.ptr = (void *)scp_fw_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[1] = {
|
||||
.type_desc = &bl2u_hash,
|
||||
.data = {
|
||||
.ptr = (void *)tb_fw_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
},
|
||||
[2] = {
|
||||
.type_desc = &ns_bl2u_hash,
|
||||
.data = {
|
||||
.ptr = (void *)nt_world_bl_hash_buf,
|
||||
.len = (unsigned int)HASH_DER_LEN
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/* SCP_BL2U */
|
||||
static const auth_img_desc_t scp_bl2u_image = {
|
||||
.img_id = SCP_BL2U_IMAGE_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &fwu_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &scp_bl2u_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/* BL2U */
|
||||
static const auth_img_desc_t bl2u_image = {
|
||||
.img_id = BL2U_IMAGE_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &fwu_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &bl2u_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
/* NS_BL2U */
|
||||
static const auth_img_desc_t ns_bl2u_image = {
|
||||
.img_id = NS_BL2U_IMAGE_ID,
|
||||
.img_type = IMG_RAW,
|
||||
.parent = &fwu_cert,
|
||||
.img_auth_methods = (const auth_method_desc_t[AUTH_METHOD_NUM]) {
|
||||
[0] = {
|
||||
.type = AUTH_METHOD_HASH,
|
||||
.param.hash = {
|
||||
.data = &raw_data,
|
||||
.hash = &ns_bl2u_hash
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
#endif /* IMAGE_BL2 */
|
||||
|
||||
/*
|
||||
* Chain of trust definition
|
||||
*/
|
||||
#ifdef IMAGE_BL1
|
||||
static const auth_img_desc_t * const cot_desc[] = {
|
||||
[TRUSTED_BOOT_FW_CERT_ID] = &trusted_boot_fw_cert,
|
||||
[BL2_IMAGE_ID] = &bl2_image,
|
||||
[HW_CONFIG_ID] = &hw_config,
|
||||
[TB_FW_CONFIG_ID] = &tb_fw_config,
|
||||
[FW_CONFIG_ID] = &fw_config,
|
||||
[FWU_CERT_ID] = &fwu_cert,
|
||||
[SCP_BL2U_IMAGE_ID] = &scp_bl2u_image,
|
||||
[BL2U_IMAGE_ID] = &bl2u_image,
|
||||
[NS_BL2U_IMAGE_ID] = &ns_bl2u_image
|
||||
};
|
||||
#else /* IMAGE_BL2 */
|
||||
static const auth_img_desc_t * const cot_desc[] = {
|
||||
[TRUSTED_BOOT_FW_CERT_ID] = &trusted_boot_fw_cert,
|
||||
[HW_CONFIG_ID] = &hw_config,
|
||||
|
|
@ -956,7 +758,6 @@ static const auth_img_desc_t * const cot_desc[] = {
|
|||
[SP_PKG8_ID] = &sp_pkg8,
|
||||
#endif
|
||||
};
|
||||
#endif
|
||||
|
||||
/* Register the CoT in the authentication module */
|
||||
REGISTER_COT(cot_desc);
|
||||
|
|
@ -384,18 +384,18 @@ ifneq (${TRUSTED_BOARD_BOOT},0)
|
|||
endif
|
||||
endif
|
||||
else ifeq (${COT},dualroot)
|
||||
BL1_SOURCES += drivers/auth/dualroot/cot.c
|
||||
BL1_SOURCES += drivers/auth/dualroot/bl1_cot.c
|
||||
ifneq (${COT_DESC_IN_DTB},0)
|
||||
BL2_SOURCES += lib/fconf/fconf_cot_getter.c
|
||||
else
|
||||
BL2_SOURCES += drivers/auth/dualroot/cot.c
|
||||
BL2_SOURCES += drivers/auth/dualroot/bl2_cot.c
|
||||
endif
|
||||
else ifeq (${COT},cca)
|
||||
BL1_SOURCES += drivers/auth/cca/cot.c
|
||||
BL1_SOURCES += drivers/auth/cca/bl1_cot.c
|
||||
ifneq (${COT_DESC_IN_DTB},0)
|
||||
BL2_SOURCES += lib/fconf/fconf_cot_getter.c
|
||||
else
|
||||
BL2_SOURCES += drivers/auth/cca/cot.c
|
||||
BL2_SOURCES += drivers/auth/cca/bl2_cot.c
|
||||
endif
|
||||
else
|
||||
$(error Unknown chain of trust ${COT})
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue