diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2017-08-02 15:19:28 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-08-09 13:37:21 -0400 |
| commit | a10c7ced3ef2782fe966a1c7b540a1d4bc679873 (patch) | |
| tree | 7d61d400a2b9eb14aa235eb798b8eb279d09444b /src | |
| parent | 9f4c91ea6f75fe56eb5becb31ce551b1806d1cd5 (diff) | |
| download | talos-hostboot-a10c7ced3ef2782fe966a1c7b540a1d4bc679873.tar.gz talos-hostboot-a10c7ced3ef2782fe966a1c7b540a1d4bc679873.zip | |
Move containerHeader class to secureboot common directory
RTC: 175115
Change-Id: Ia12949a63100202895be315cb7febb85df3cda3e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44131
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/usr/secureboot/containerheader.H | 2 | ||||
| -rw-r--r-- | src/usr/secureboot/base/makefile | 1 | ||||
| -rw-r--r-- | src/usr/secureboot/common/common.mk | 1 | ||||
| -rw-r--r-- | src/usr/secureboot/common/containerheader.C (renamed from src/usr/secureboot/base/containerheader.C) | 8 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/include/usr/secureboot/containerheader.H b/src/include/usr/secureboot/containerheader.H index 528fef9d5..5a554f0fc 100644 --- a/src/include/usr/secureboot/containerheader.H +++ b/src/include/usr/secureboot/containerheader.H @@ -195,7 +195,9 @@ class ContainerHeader * and then take sha512 hash. * Also sets iv_hwKeyHash private member */ +#ifndef __HOSTBOOT_RUNTIME void genHwKeyHash(); +#endif /** * @brief Weak check to determine if secureboot header looks right. diff --git a/src/usr/secureboot/base/makefile b/src/usr/secureboot/base/makefile index 58d79be86..e898204e9 100644 --- a/src/usr/secureboot/base/makefile +++ b/src/usr/secureboot/base/makefile @@ -34,7 +34,6 @@ OBJS += securerommgr.o OBJS += rom_entry.o OBJS += trustedboot_base.o OBJS += $(if $(CONFIG_TPMDD),trustedbootMsg.o,) -OBJS += containerheader.o OBJS += ${SECUREBOOT_COMMON_OBJS} OBJS += targutilbase.o diff --git a/src/usr/secureboot/common/common.mk b/src/usr/secureboot/common/common.mk index 8e2b4f8d4..06f7a0bae 100644 --- a/src/usr/secureboot/common/common.mk +++ b/src/usr/secureboot/common/common.mk @@ -25,4 +25,5 @@ SECUREBOOT_COMMON_OBJS += securetrace.o SECUREBOOT_COMMON_OBJS += errlud_secure.o +SECUREBOOT_COMMON_OBJS += containerheader.o diff --git a/src/usr/secureboot/base/containerheader.C b/src/usr/secureboot/common/containerheader.C index e01ab381f..3671b75c7 100644 --- a/src/usr/secureboot/base/containerheader.C +++ b/src/usr/secureboot/common/containerheader.C @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/secureboot/base/containerheader.C $ */ +/* $Source: src/usr/secureboot/common/containerheader.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ @@ -80,8 +80,10 @@ void ContainerHeader::parse_header(const void* i_header) // Parse hw and sw flags parseFlags(); +#ifndef __HOSTBOOT_RUNTIME // Generate hw hash key genHwKeyHash(); +#endif // After parsing check if header is valid, do some quick bound checks validate(); @@ -239,11 +241,15 @@ void ContainerHeader::parseFlags() & KEY_TRANSITION_FLAG); } +#ifndef __HOSTBOOT_RUNTIME void ContainerHeader::genHwKeyHash() { + // Generate and store hw hash key SECUREBOOT::hashBlob(&iv_headerInfo.hw_hdr.hw_pkey_a, totalHwKeysSize, iv_hwKeyHash); + } +#endif }; //end of SECUREBOOT namespace |
