summaryrefslogtreecommitdiffstats
path: root/src/include/usr/secureboot
diff options
context:
space:
mode:
authorJaymes Wilks <mjwilks@us.ibm.com>2017-07-25 16:08:02 -0500
committerDaniel M. Crowell <dcrowell@us.ibm.com>2017-08-04 09:53:51 -0400
commit0914d87ae57960ef859886a67b5ae1187aa82474 (patch)
treead0c445fa7b0294150e0a5ff3aadc955ea40ca89 /src/include/usr/secureboot
parent69b38d2b257691fb31347ef0ab1ffab9f74d8ab7 (diff)
downloadblackbird-hostboot-0914d87ae57960ef859886a67b5ae1187aa82474.tar.gz
blackbird-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/include/usr/secureboot')
-rw-r--r--src/include/usr/secureboot/service.H8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/include/usr/secureboot/service.H b/src/include/usr/secureboot/service.H
index 0baa3a70e..2f0430d83 100644
--- a/src/include/usr/secureboot/service.H
+++ b/src/include/usr/secureboot/service.H
@@ -33,8 +33,6 @@
#include <securerom/sha512.H>
#include <securerom/ROM.H>
-typedef uint8_t SHA512_t[SHA512_DIGEST_LENGTH];
-
/*
* @brief Used to capture the first 4 bytes of the hash for tracing purposes
*/
@@ -222,7 +220,7 @@ namespace SECUREBOOT
* @return errlHndl_t NULL on success
*/
errlHndl_t verifyContainer(void * i_container,
- const sha2_hash_t* i_hwKeyHash = nullptr);
+ const SHA512_t* i_hwKeyHash = nullptr);
/**
* @brief Hash Signed Blob
@@ -238,10 +236,10 @@ namespace SECUREBOOT
/**
* @brief Retrieve the internal hardware keys' hash used to validate
* containers
- * @param[out] o_hash Reference to the sha2_hash_t array to copy the
+ * @param[out] o_hash Reference to the SHA512_t array to copy the
* hash to.
*/
- void getHwKeyHash(sha2_hash_t o_hash);
+ void getHwKeyHash(SHA512_t o_hash);
/*
* @brief Hash the concatenation of N Blobs
OpenPOWER on IntegriCloud