arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-14 03:30:02 +00:00
Code Issues Releases Wiki Activity

fix prefixes in internal functions as well

Browse Source
This commit is contained in:
Pavol Rusnak 2014-02-19 21:42:14 +01:00
parent d0e152a088
commit b08d44d39e
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sha2.c
View File

@ -174,9 +174,9 @@ typedef uint64_t sha2_word64; /* Exactly 8 bytes */
* library -- they are intended for private internal visibility/use * library -- they are intended for private internal visibility/use
* only. * only.
*/ */
void SHA512_Last(SHA512_CTX*); void sha512_Last(SHA512_CTX*);
void SHA256_Transform(SHA256_CTX*, const sha2_word32*); void sha256_Transform(SHA256_CTX*, const sha2_word32*);
void SHA512_Transform(SHA512_CTX*, const sha2_word64*); void sha512_Transform(SHA512_CTX*, const sha2_word64*);
/*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/ /*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/
@ -334,7 +334,7 @@ void sha256_Init(SHA256_CTX* context) {
(h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \ (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \
j++ j++
void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { void sha256_Transform(SHA256_CTX* context, const sha2_word32* data) {
sha2_word32 a, b, c, d, e, f, g, h, s0, s1; sha2_word32 a, b, c, d, e, f, g, h, s0, s1;
sha2_word32 T1, *W256; sha2_word32 T1, *W256;
int j; int j;
@ -392,7 +392,7 @@ void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) {
#else /* SHA2_UNROLL_TRANSFORM */ #else /* SHA2_UNROLL_TRANSFORM */
void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { void sha256_Transform(SHA256_CTX* context, const sha2_word32* data) {
sha2_word32 a, b, c, d, e, f, g, h, s0, s1; sha2_word32 a, b, c, d, e, f, g, h, s0, s1;
sha2_word32 T1, T2, *W256; sha2_word32 T1, T2, *W256;
int j; int j;
@ -491,7 +491,7 @@ void sha256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
context->bitcount += freespace << 3; context->bitcount += freespace << 3;
len -= freespace; len -= freespace;
data += freespace; data += freespace;
SHA256_Transform(context, (sha2_word32*)context->buffer); sha256_Transform(context, (sha2_word32*)context->buffer);
} else { } else {
/* The buffer is not yet full */ /* The buffer is not yet full */
MEMCPY_BCOPY(&context->buffer[usedspace], data, len); MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
@ -503,7 +503,7 @@ void sha256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
} }
while (len >= SHA256_BLOCK_LENGTH) { while (len >= SHA256_BLOCK_LENGTH) {
/* Process as many complete blocks as we can */ /* Process as many complete blocks as we can */
SHA256_Transform(context, (sha2_word32*)data); sha256_Transform(context, (sha2_word32*)data);
context->bitcount += SHA256_BLOCK_LENGTH << 3; context->bitcount += SHA256_BLOCK_LENGTH << 3;
len -= SHA256_BLOCK_LENGTH; len -= SHA256_BLOCK_LENGTH;
data += SHA256_BLOCK_LENGTH; data += SHA256_BLOCK_LENGTH;
@ -540,7 +540,7 @@ void sha256_Final(sha2_byte digest[], SHA256_CTX* context) {
MEMSET_BZERO(&context->buffer[usedspace], SHA256_BLOCK_LENGTH - usedspace); MEMSET_BZERO(&context->buffer[usedspace], SHA256_BLOCK_LENGTH - usedspace);
} }
/* Do second-to-last transform: */ /* Do second-to-last transform: */
SHA256_Transform(context, (sha2_word32*)context->buffer); sha256_Transform(context, (sha2_word32*)context->buffer);
/* And set-up for the last transform: */ /* And set-up for the last transform: */
MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH); MEMSET_BZERO(context->buffer, SHA256_SHORT_BLOCK_LENGTH);
@ -557,7 +557,7 @@ void sha256_Final(sha2_byte digest[], SHA256_CTX* context) {
*t = context->bitcount; *t = context->bitcount;
/* Final transform: */ /* Final transform: */
SHA256_Transform(context, (sha2_word32*)context->buffer); sha256_Transform(context, (sha2_word32*)context->buffer);
#if BYTE_ORDER == LITTLE_ENDIAN #if BYTE_ORDER == LITTLE_ENDIAN
{ {
@ -660,7 +660,7 @@ void sha512_Init(SHA512_CTX* context) {
(h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \ (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \
j++ j++
void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { void sha512_Transform(SHA512_CTX* context, const sha2_word64* data) {
sha2_word64 a, b, c, d, e, f, g, h, s0, s1; sha2_word64 a, b, c, d, e, f, g, h, s0, s1;
sha2_word64 T1, *W512 = (sha2_word64*)context->buffer; sha2_word64 T1, *W512 = (sha2_word64*)context->buffer;
int j; int j;
@ -715,7 +715,7 @@ void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) {
#else /* SHA2_UNROLL_TRANSFORM */ #else /* SHA2_UNROLL_TRANSFORM */
void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { void sha512_Transform(SHA512_CTX* context, const sha2_word64* data) {
sha2_word64 a, b, c, d, e, f, g, h, s0, s1; sha2_word64 a, b, c, d, e, f, g, h, s0, s1;
sha2_word64 T1, T2, *W512 = (sha2_word64*)context->buffer; sha2_word64 T1, T2, *W512 = (sha2_word64*)context->buffer;
int j; int j;
@ -812,7 +812,7 @@ void sha512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
ADDINC128(context->bitcount, freespace << 3); ADDINC128(context->bitcount, freespace << 3);
len -= freespace; len -= freespace;
data += freespace; data += freespace;
SHA512_Transform(context, (sha2_word64*)context->buffer); sha512_Transform(context, (sha2_word64*)context->buffer);
} else { } else {
/* The buffer is not yet full */ /* The buffer is not yet full */
MEMCPY_BCOPY(&context->buffer[usedspace], data, len); MEMCPY_BCOPY(&context->buffer[usedspace], data, len);
@ -824,7 +824,7 @@ void sha512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
} }
while (len >= SHA512_BLOCK_LENGTH) { while (len >= SHA512_BLOCK_LENGTH) {
/* Process as many complete blocks as we can */ /* Process as many complete blocks as we can */
SHA512_Transform(context, (sha2_word64*)data); sha512_Transform(context, (sha2_word64*)data);
ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3); ADDINC128(context->bitcount, SHA512_BLOCK_LENGTH << 3);
len -= SHA512_BLOCK_LENGTH; len -= SHA512_BLOCK_LENGTH;
data += SHA512_BLOCK_LENGTH; data += SHA512_BLOCK_LENGTH;
@ -838,7 +838,7 @@ void sha512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
usedspace = freespace = 0; usedspace = freespace = 0;
} }
void SHA512_Last(SHA512_CTX* context) { void sha512_Last(SHA512_CTX* context) {
unsigned int usedspace; unsigned int usedspace;
usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH; usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH;
@ -859,7 +859,7 @@ void SHA512_Last(SHA512_CTX* context) {
MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace); MEMSET_BZERO(&context->buffer[usedspace], SHA512_BLOCK_LENGTH - usedspace);
} }
/* Do second-to-last transform: */ /* Do second-to-last transform: */
SHA512_Transform(context, (sha2_word64*)context->buffer); sha512_Transform(context, (sha2_word64*)context->buffer);
/* And set-up for the last transform: */ /* And set-up for the last transform: */
MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2); MEMSET_BZERO(context->buffer, SHA512_BLOCK_LENGTH - 2);
@ -879,7 +879,7 @@ void SHA512_Last(SHA512_CTX* context) {
*t = context->bitcount[0]; *t = context->bitcount[0];
/* Final transform: */ /* Final transform: */
SHA512_Transform(context, (sha2_word64*)context->buffer); sha512_Transform(context, (sha2_word64*)context->buffer);
} }
void sha512_Final(sha2_byte digest[], SHA512_CTX* context) { void sha512_Final(sha2_byte digest[], SHA512_CTX* context) {
@ -887,7 +887,7 @@ void sha512_Final(sha2_byte digest[], SHA512_CTX* context) {
/* If no digest buffer is passed, we don't bother doing this: */ /* If no digest buffer is passed, we don't bother doing this: */
if (digest != (sha2_byte*)0) { if (digest != (sha2_byte*)0) {
SHA512_Last(context); sha512_Last(context);
/* Save the hash data for output: */ /* Save the hash data for output: */
#if BYTE_ORDER == LITTLE_ENDIAN #if BYTE_ORDER == LITTLE_ENDIAN