X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=md5%2Fmd5.c;fp=md5%2Fmd5.c;h=3feddd6881b17d2e80b7c33b7ce33951435e7161;hp=003699e5ef4ae65486bece16d9cdfbe21a4cca2b;hb=cc6b183296a5852449e3324737e2a2dece788786;hpb=06d9213f132d05f61b65acc51de6f7ad1b42f48a diff --git a/md5/md5.c b/md5/md5.c index 003699e..3feddd6 100644 --- a/md5/md5.c +++ b/md5/md5.c @@ -139,32 +139,35 @@ void md5_nextBlock(md5_ctx_t *state, const void* block){ void md5_lastBlock(md5_ctx_t *state, const void* block, uint16_t length_b){ uint16_t l; - uint8_t b[64]; + union { + uint8_t v8[64]; + uint64_t v64[ 8]; + } buffer; while (length_b >= 512){ md5_nextBlock(state, block); length_b -= 512; block = ((uint8_t*)block) + 512/8; } - memset(b, 0, 64); - memcpy(b, block, length_b/8); + memset(buffer.v8, 0, 64); + memcpy(buffer.v8, block, length_b/8); /* insert padding one */ l=length_b/8; if(length_b%8){ uint8_t t; t = ((uint8_t*)block)[l]; t |= (0x80>>(length_b%8)); - b[l]=t; + buffer.v8[l]=t; }else{ - b[l]=0x80; + buffer.v8[l]=0x80; } /* insert length value */ if(l+sizeof(uint64_t) >= 512/8){ - md5_nextBlock(state, b); + md5_nextBlock(state, buffer.v8); state->counter--; - memset(b, 0, 64-8); + memset(buffer.v8, 0, 64-8); } - *((uint64_t*)&b[64-sizeof(uint64_t)]) = (state->counter * 512) + length_b; - md5_nextBlock(state, b); + buffer.v64[7] = (state->counter * 512) + length_b; + md5_nextBlock(state, buffer.v8); } void md5_ctx2hash(md5_hash_t* dest, const md5_ctx_t* state){