diff options
| author | Jaymes Wilks <mjwilks@us.ibm.com> | 2017-07-25 16:08:02 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-08-04 09:53:51 -0400 |
| commit | 0914d87ae57960ef859886a67b5ae1187aa82474 (patch) | |
| tree | ad0c445fa7b0294150e0a5ff3aadc955ea40ca89 /src/usr/secureboot/trusted | |
| parent | 69b38d2b257691fb31347ef0ab1ffab9f74d8ab7 (diff) | |
| download | talos-hostboot-0914d87ae57960ef859886a67b5ae1187aa82474.tar.gz talos-hostboot-0914d87ae57960ef859886a67b5ae1187aa82474.zip | |
Fix duplicate sha512 definitions
All instances for sha2_hash_t have been replaced with SHA512_t and
the SHA512_t typedef is now in securerom/contrib/sha512.H in place
of the old definition.
Change-Id: I32524524d755eb3b0264881317d9be5a294dc9a7
RTC:172333
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43610
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Stephen M. Cprek <smcprek@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: Michael Baiocchi <mbaiocch@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/secureboot/trusted')
| -rw-r--r-- | src/usr/secureboot/trusted/trustedboot.C | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/secureboot/trusted/trustedboot.C b/src/usr/secureboot/trusted/trustedboot.C index 20a099adb..6682bf829 100644 --- a/src/usr/secureboot/trusted/trustedboot.C +++ b/src/usr/secureboot/trusted/trustedboot.C @@ -703,11 +703,11 @@ errlHndl_t tpmLogConfigEntries(TRUSTEDBOOT::TpmTarget* const i_pTpm) } // HW Key Hash - sha2_hash_t l_hw_key_hash; + SHA512_t l_hw_key_hash; SECUREBOOT::getHwKeyHash(l_hw_key_hash); l_err = pcrExtend(PCR_1, EV_PLATFORM_CONFIG_FLAGS, l_hw_key_hash, - sizeof(sha2_hash_t),"HW KEY HASH"); + sizeof(SHA512_t),"HW KEY HASH"); if (l_err) { break; |
