From 0980ee827a12da7c23e205e71b2d8ad82e63a27c Mon Sep 17 00:00:00 2001 From: Mirek Kratochvil Date: Sat, 25 May 2013 17:44:27 +0200 Subject: [PATCH] sha2: fix the ugly warning memcpy() is better than dereferencing a type-punned-pointer for simulating memcpy() --- src/sha2.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/sha2.c b/src/sha2.c index b803118..13bb657 100644 --- a/src/sha2.c +++ b/src/sha2.c @@ -609,7 +609,8 @@ void SHA256_Final (sha2_byte digest[], SHA256_CTX* context) *context->buffer = 0x80; } /* Set the bit count: */ - * (sha2_word64*) &context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount; + MEMCPY_BCOPY (context->buffer + SHA256_SHORT_BLOCK_LENGTH, &context->bitcount, 8); + /* Final transform: */ SHA256_Transform (context, (sha2_word32*) context->buffer); @@ -933,8 +934,8 @@ void SHA512_Last (SHA512_CTX* context) *context->buffer = 0x80; } /* Store the length of input data (in bits): */ - * (sha2_word64*) &context->buffer[SHA512_SHORT_BLOCK_LENGTH] = context->bitcount[1]; - * (sha2_word64*) &context->buffer[SHA512_SHORT_BLOCK_LENGTH + 8] = context->bitcount[0]; + MEMCPY_BCOPY (context->buffer + SHA512_SHORT_BLOCK_LENGTH, context->bitcount+1, 8); + MEMCPY_BCOPY (context->buffer + SHA512_SHORT_BLOCK_LENGTH + 8, context->bitcount, 8); /* Final transform: */ SHA512_Transform (context, (sha2_word64*) context->buffer);