diff options
| author | Stephen Cprek <smcprek@us.ibm.com> | 2017-01-06 16:26:20 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-01-30 11:20:12 -0500 |
| commit | b83556b80737f7098ce5cae73a61068f8bf56184 (patch) | |
| tree | bc3d819601baba51459664152955c70da0bc2111 /src/usr/secureboot/base/containerheader.C | |
| parent | 6b650f5428297e8dde075d25e7862a20c8d47f04 (diff) | |
| download | talos-hostboot-b83556b80737f7098ce5cae73a61068f8bf56184.tar.gz talos-hostboot-b83556b80737f7098ce5cae73a61068f8bf56184.zip | |
Use common ROM header files for rom, bootloader, and hostboot
Change-Id: I4d7db7293d44633cf1646f69ab98ddc8d66338ca
RTC: 143902
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/34525
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-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/usr/secureboot/base/containerheader.C')
| -rw-r--r-- | src/usr/secureboot/base/containerheader.C | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/usr/secureboot/base/containerheader.C b/src/usr/secureboot/base/containerheader.C index a807d7d12..7c518adbf 100644 --- a/src/usr/secureboot/base/containerheader.C +++ b/src/usr/secureboot/base/containerheader.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016 */ +/* Contributors Listed Below - COPYRIGHT 2016,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -44,7 +44,7 @@ void ContainerHeader::parse_header(const void* i_header) // Early check if magic number is valid, as a quick check to try and prevent // any storage exceptions while parsing header. - assert(iv_headerInfo.hw_hdr.magic_number == MAGIC_NUMBER, + assert(iv_headerInfo.hw_hdr.magic_number == ROM_MAGIC_NUMBER, "ContainerHeader: magic number = 0x%08X not valid", iv_headerInfo.hw_hdr.magic_number); @@ -195,7 +195,7 @@ const SHA512_t* ContainerHeader::hwKeyHash() const void ContainerHeader::validate() { iv_isValid = (iv_hdrBytesRead <= MAX_SECURE_HEADER_SIZE) - && (iv_headerInfo.hw_hdr.magic_number == MAGIC_NUMBER) + && (iv_headerInfo.hw_hdr.magic_number == ROM_MAGIC_NUMBER) && (iv_headerInfo.hw_hdr.version == ROM_VERSION) && (iv_headerInfo.hw_prefix_hdr.ver_alg.version == ROM_VERSION) && (iv_headerInfo.hw_prefix_hdr.ver_alg.hash_alg == ROM_HASH_ALG) |
