X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=md5.c;h=20ec519c961a9152c235d8653351da9d0bbbee20;hb=e23491896d12022bdd94ba9fb47dee2e6e9fed89;hp=c995b2a07a82bfe1b2120f6d927dd627cbe47806;hpb=5ac75cfae217122b540c1a6d258054230dc534c3;p=avr-crypto-lib.git

diff --git a/md5.c b/md5.c
index c995b2a..20ec519 100644
--- a/md5.c
+++ b/md5.c
@@ -1,6 +1,6 @@
 /* md5.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -80,11 +80,12 @@ void md5_core(uint32_t* a, void* block, uint8_t as, uint8_t s, uint8_t i, uint8_
 	uart_hexdump(&s, 1); uart_putc(' ');
 	uart_hexdump(&i, 1); uart_putc(']');
 #endif	
-	t = a[as] + funcs[fi](a[(as+1)&3], a[(as+2)&3], a[(as+3)&3]) + *((uint32_t*)block) + md5_T[i] ;
+	t = a[as] + funcs[fi](a[(as+1)&3], a[(as+2)&3], a[(as+3)&3]) 
+	    + *((uint32_t*)block) + pgm_read_dword(md5_T+i) ;
 	a[as]=a[(as+1)&3] + ROTL32(t, s);
 }
 
-void md5_nextBlock(md5_ctx_t *state, void* block){
+void md5_nextBlock(md5_ctx_t *state, const void* block){
 	uint32_t	a[4];
 	uint8_t		m,n,i=0;
 	/* this requires other mixed sboxes */
@@ -136,7 +137,7 @@ void md5_nextBlock(md5_ctx_t *state, void* block){
 	state->counter++;
 }
 
-void md5_lastBlock(md5_ctx_t *state, void* block, uint16_t length_b){
+void md5_lastBlock(md5_ctx_t *state, const void* block, uint16_t length_b){
 	uint16_t l;
 	uint8_t b[64];
 	while (length_b >= 512){
@@ -160,8 +161,25 @@ void md5_lastBlock(md5_ctx_t *state, void* block, uint16_t length_b){
 	if(l+sizeof(uint64_t) >= 512/8){
 		md5_nextBlock(state, b);
 		state->counter--;
-		memset(b, 0, 64);
+		memset(b, 0, 64-8);
 	}
 	*((uint64_t*)&b[64-sizeof(uint64_t)]) = (state->counter * 512) + length_b;
 	md5_nextBlock(state, b);
 }
+
+void md5_ctx2hash(md5_hash_t* dest, const md5_ctx_t* state){
+	memcpy(dest, state->a, MD5_HASH_BYTES);
+}
+
+void md5(md5_hash_t* dest, const void* msg, uint32_t length_b){
+	md5_ctx_t ctx;
+	md5_init(&ctx);
+	while(length_b>=MD5_BLOCK_BITS){
+		md5_nextBlock(&ctx, msg);
+		msg = (uint8_t*)msg + MD5_BLOCK_BYTES;
+		length_b -= MD5_BLOCK_BITS;
+	}
+	md5_lastBlock(&ctx, msg, length_b);
+	md5_ctx2hash(dest, &ctx);
+}
+