arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 22:38:08 +00:00
Code Issues Releases Wiki Activity

sha2: Fix unaligned access

Browse Source
This commit is contained in:
Jochen Hoenicke 2016-08-29 20:33:35 +02:00
parent 7ce6b8b147
commit b3e6eecfce
No known key found for this signature in database
GPG Key ID: 65B10C0466560648
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sha2.c
View File

@ -480,7 +480,6 @@ void sha256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
} }
void sha256_Final(SHA256_CTX* context, sha2_byte digest[]) { void sha256_Final(SHA256_CTX* context, sha2_byte digest[]) {
sha2_word32 *d = (sha2_word32*)(void*)digest;
unsigned int usedspace; unsigned int usedspace;
/* If no digest buffer is passed, we don't bother doing this: */ /* If no digest buffer is passed, we don't bother doing this: */
@ -528,7 +527,7 @@ void sha256_Final(SHA256_CTX* context, sha2_byte digest[]) {
REVERSE32(context->state[j],context->state[j]); REVERSE32(context->state[j],context->state[j]);
} }
#endif #endif
MEMCPY_BCOPY(d, context->state, SHA256_DIGEST_LENGTH); MEMCPY_BCOPY(digest, context->state, SHA256_DIGEST_LENGTH);
} }
/* Clean up state data: */ /* Clean up state data: */
@ -770,7 +769,7 @@ void sha512_Update(SHA512_CTX* context, const sha2_byte *data, size_t len) {
#if BYTE_ORDER == LITTLE_ENDIAN #if BYTE_ORDER == LITTLE_ENDIAN
/* Convert TO host byte order */ /* Convert TO host byte order */
for (int j = 0; j < 16; j++) { for (int j = 0; j < 16; j++) {
REVERSE64(((sha2_word64*)data)[j],context->buffer[j]); REVERSE64(context->buffer[j],context->buffer[j]);
} }
#endif #endif
sha512_Transform(context->state, context->buffer, context->state); sha512_Transform(context->state, context->buffer, context->state);
@ -831,8 +830,6 @@ static void sha512_Last(SHA512_CTX* context) {
} }
void sha512_Final(SHA512_CTX* context, sha2_byte digest[]) { void sha512_Final(SHA512_CTX* context, sha2_byte digest[]) {
sha2_word64 *d = (sha2_word64*)(void*)digest;
/* 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);
@ -844,7 +841,7 @@ void sha512_Final(SHA512_CTX* context, sha2_byte digest[]) {
REVERSE64(context->state[j],context->state[j]); REVERSE64(context->state[j],context->state[j]);
} }
#endif #endif
MEMCPY_BCOPY(d, context->state, SHA512_DIGEST_LENGTH); MEMCPY_BCOPY(digest, context->state, SHA512_DIGEST_LENGTH);
} }
/* Zero out state data */ /* Zero out state data */