summaryrefslogtreecommitdiffstats
path: root/src/securerom/contrib
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/securerom/contrib
parent69b38d2b257691fb31347ef0ab1ffab9f74d8ab7 (diff)
downloadtalos-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/securerom/contrib')
-rw-r--r--src/securerom/contrib/sha512.C6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/securerom/contrib/sha512.C b/src/securerom/contrib/sha512.C
index 6ce16ce1c..65d29cbac 100644
--- a/src/securerom/contrib/sha512.C
+++ b/src/securerom/contrib/sha512.C
@@ -406,7 +406,7 @@ static void SHA512_Last(SHA512_CTX* context)
}
asm(".globl .L.SHA512_Final");
-void SHA512_Final(SHA512_CTX* context, sha2_hash_t *result) {
+void SHA512_Final(SHA512_CTX* context, SHA512_t *result) {
/* Sanity check: */
//assert(context != (SHA512_CTX*)0);
@@ -421,10 +421,10 @@ void SHA512_Final(SHA512_CTX* context, sha2_hash_t *result) {
}
asm(".globl .L.SHA512_Hash");
-void SHA512_Hash(const sha2_byte* data, size_t len, sha2_hash_t *result) {
+void SHA512_Hash(const sha2_byte* data, size_t len, SHA512_t *result) {
SHA512_CTX context;
SHA512_Init(&context);
SHA512_Update(&context, data, len);
SHA512_Final(&context, result);
-} \ No newline at end of file
+}
OpenPOWER on IntegriCloud