X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=hmac-sha1%2Fhmac-sha1.c;h=9f225909e193345bb67e6cefe39ba42c3cbcd157;hb=22985930c9c2c610ae18e2d8df0f3ea78a082134;hp=783040208cca6e1ac7faf217df814aa4e170a716;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;p=avr-crypto-lib.git

diff --git a/hmac-sha1/hmac-sha1.c b/hmac-sha1/hmac-sha1.c
index 7830402..9f22590 100644
--- a/hmac-sha1/hmac-sha1.c
+++ b/hmac-sha1/hmac-sha1.c
@@ -31,7 +31,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "config.h"
-#include "sha1/sha1.h"
+#include "sha1.h"
 #include "hmac-sha1.h"
 
 #define IPAD 0x36
@@ -40,7 +40,7 @@
 
 #ifndef HMAC_SHORTONLY
 
-void hmac_sha1_init(hmac_sha1_ctx_t *s, const void* key, uint16_t keylength_b){
+void hmac_sha1_init(hmac_sha1_ctx_t *s, const void *key, uint16_t keylength_b){
 	uint8_t buffer[SHA1_BLOCK_BYTES];
 	uint8_t i;
 	
@@ -69,22 +69,22 @@ void hmac_sha1_init(hmac_sha1_ctx_t *s, const void* key, uint16_t keylength_b){
 #endif
 }
 
-void hmac_sha1_nextBlock(hmac_sha1_ctx_t *s, const void* block){
+void hmac_sha1_nextBlock(hmac_sha1_ctx_t *s, const void *block){
 	sha1_nextBlock(&(s->a), block);
 }
-void hmac_sha1_lastBlock(hmac_sha1_ctx_t *s, const void* block, uint16_t length_b){
+void hmac_sha1_lastBlock(hmac_sha1_ctx_t *s, const void *block, uint16_t length_b){
 	while(length_b>=SHA1_BLOCK_BITS){
-		sha1_nextBlock(&(s->a), block);
+		sha1_nextBlock(&s->a, block);
 		block = (uint8_t*)block + SHA1_BLOCK_BYTES;
 		length_b -= SHA1_BLOCK_BITS;
 	}
-	sha1_lastBlock(&(s->a), block, length_b);
+	sha1_lastBlock(&s->a, block, length_b);
 }
 
-void hmac_sha1_final(void* dest, hmac_sha1_ctx_t *s){
-	sha1_ctx2hash((sha1_hash_t*)dest, &(s->a));
-	sha1_lastBlock(&(s->b), dest, SHA1_HASH_BITS);
-	sha1_ctx2hash((sha1_hash_t*)dest, &(s->b));
+void hmac_sha1_final(void *dest, hmac_sha1_ctx_t *s){
+	sha1_ctx2hash(dest, &s->a);
+	sha1_lastBlock(&s->b, dest, SHA1_HASH_BITS);
+	sha1_ctx2hash(dest, &(s->b));
 }
 
 #endif
@@ -93,7 +93,7 @@ void hmac_sha1_final(void* dest, hmac_sha1_ctx_t *s){
  * keylength in bits!
  * message length in bits!
  */
-void hmac_sha1(void* dest, const void* key, uint16_t keylength_b, const void* msg, uint32_t msglength_b){ /* a one-shot*/
+void hmac_sha1(void *dest, const void *key, uint16_t keylength_b, const void *msg, uint32_t msglength_b){ /* a one-shot*/
 	sha1_ctx_t s;
 	uint8_t i;
 	uint8_t buffer[SHA1_BLOCK_BYTES];