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/include/securerom/contrib | |
| 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/include/securerom/contrib')
| -rw-r--r-- | src/include/securerom/contrib/sha512.H | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/include/securerom/contrib/sha512.H b/src/include/securerom/contrib/sha512.H index 9ae4310f8..c273fb050 100644 --- a/src/include/securerom/contrib/sha512.H +++ b/src/include/securerom/contrib/sha512.H @@ -59,8 +59,7 @@ #include <stdlib.h> -typedef uint8_t __attribute__((aligned(8))) \ - sha2_hash_t[ SHA512_DIGEST_LENGTH / sizeof(uint8_t) ]; +typedef uint8_t SHA512_t[SHA512_DIGEST_LENGTH]; typedef uint8_t sha2_byte; /* Exactly 1 byte */ typedef uint32_t sha2_word32; /* Exactly 4 bytes */ @@ -73,13 +72,14 @@ typedef struct _SHA512_CTX uint8_t buffer[SHA512_BLOCK_LENGTH]; } SHA512_CTX; + extern "C" void SHA512_Init(SHA512_CTX* context); extern "C" void SHA512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len); extern "C" -void SHA512_Final(SHA512_CTX* context, sha2_hash_t *result); +void SHA512_Final(SHA512_CTX* context, SHA512_t *result); extern "C" -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); #endif |
