changing hmac API + bug fixes

[avr-crypto-lib.git] / hmac-sha1.h

diff --git a/hmac-sha1.h b/hmac-sha1.h
index 90c32cd07cd3dc5cb0212793b26dffdefd40aecf..d0be0299b24fcaa19745bee15ff5bb9bc28b5c55 100644 (file)
--- a/hmac-sha1.h
+++ b/hmac-sha1.h
@@ -21,15 +21,21 @@
 
 #include "sha1.h"
 
-#define HMACSHA1_BITS SHA1_HASH_BITS
-#define HMACSHA1_BYTES ((HMACSHA1_BITS+7)/8)
+#define HMAC_SHA1_BITS        SHA1_HASH_BITS
+#define HMAC_SHA1_BYTES       SHA1_HASH_BYTES
+#define HMAC_SHA1_BLOCK_BITS  SHA1_BLOCK_BITS
+#define HMAC_SHA1_BLOCK_BYTES SHA1_BLOCK_BYTES
 
-typedef sha1_ctx_t hmac_sha1_ctx_t;
+typedef struct{
+        sha1_ctx_t a, b;
+} hmac_sha1_ctx_t;
 
 
-void hmac_sha1_init(hmac_sha1_ctx_t *s, void* key, uint16_t keylength_b);
-void hmac_sha1_final(hmac_sha1_ctx_t *s, void* key, uint16_t keylength_b);
-void hmac_sha1(void* dest, void* key, uint16_t keylength_b, void* msg, uint32_t msglength_b);
+void hmac_sha1_init(hmac_sha1_ctx_t *s, const void* key, uint16_t keylength_b);
+void hmac_sha1_nextBlock(hmac_sha1_ctx_t *s, const void* block);
+void hmac_sha1_lastBlock(hmac_sha1_ctx_t *s, const void* block, uint16_t length_b);
+void hmac_sha1_final(void* dest, hmac_sha1_ctx_t *s);
 
+void hmac_sha1(void* dest, const void* key, uint16_t keylength_b, const void* msg, uint32_t msglength_b);
 
 #endif /*HMACSHA1_H_*/