changing hmac API + bug fixes

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

diff --git a/hmac-sha256.h b/hmac-sha256.h
index 4a3d7f33fa60a36465baac6f725f23f8d46ae880..4df6af5e93f37f8fefd6f7a0de88e6705b30c006 100644 (file)
--- a/hmac-sha256.h
+++ b/hmac-sha256.h
@@ -21,15 +21,23 @@
 
 #include "sha256.h"
 
-#define HMAC_BITS SHA256_HASH_BITS
-#define HMAC_BYTES ((HMAC_BITS+7)/8)
+#define HMAC_SHA256_BITS        SHA256_HASH_BITS
+#define HMAC_SHA256_BYTES       SHA256_HASH_BYTES
+#define HMAC_SHA256_BLOCK_BITS  SHA256_BLOCK_BITS
+#define HMAC_SHA256_BLOCK_BYTES SHA256_BLOCK_BYTES
 
-typedef sha256_ctx_t hmac_sha256_ctx_t;
 
+typedef struct {
+       sha256_ctx_t a,b;
+} hmac_sha256_ctx_t;
 
-void hmac_sha256_init(hmac_sha256_ctx_t *s, void* key, uint16_t keylength_b);
-void hmac_sha256_final(hmac_sha256_ctx_t *s, void* key, uint16_t keylength_b);
-void hmac_sha256(void* dest, void* key, uint16_t keylength_b, void* msg, uint64_t msglength_b);
+
+void hmac_sha256_init(hmac_sha256_ctx_t *s, const void* key, uint16_t keylength_b);
+void hmac_sha256_nextBlock(hmac_sha256_ctx_t *s, const void* block);
+void hmac_sha256_lastBlock(hmac_sha256_ctx_t *s, const void* block, uint16_t length_b);
+void hmac_sha256_final(void* dest, hmac_sha256_ctx_t *s);
+
+void hmac_sha256(void* dest, const void* key, uint16_t keylength_b, const void* msg, uint32_t msglength_b);
 
 
 #endif /*HMACSHA256_H_*/