X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=hmac-sha256.c;h=4e23f8e5de18d62d81be3b5f66d7b85ef3683c13;hb=2aee09dcaf731b4086e7cdb865ee77b2715ce751;hp=714933f8cda7a4ea48b59e9f42f57d37f65ed842;hpb=639b9bea16571c3f3a901cefc4bca48f84b09705;p=avr-crypto-lib.git

diff --git a/hmac-sha256.c b/hmac-sha256.c
index 714933f..4e23f8e 100644
--- a/hmac-sha256.c
+++ b/hmac-sha256.c
@@ -26,10 +26,11 @@ void hmac_sha256_init(hmac_sha256_ctx_t *s, void* key, uint16_t kl){
 	uint8_t buffer[SHA256_BLOCK_BITS/8];
 	uint8_t i;
 	
+	memset(buffer, 0, SHA256_BLOCK_BITS/8);
 	if (kl > SHA256_BLOCK_BITS){
 		sha256((void*)buffer, key, kl);
 	} else {
-		memcpy(buffer, key, (kl+7/8));
+		memcpy(buffer, key, (kl+7)/8);
 	}
 	
 	for (i=0; i<SHA256_BLOCK_BITS/8; ++i){
@@ -48,6 +49,7 @@ void hmac_sha256_final(hmac_sha256_ctx_t *s, void* key, uint16_t kl){
 	uint8_t i;
 	sha256_ctx_t a;
 	
+	memset(buffer, 0, SHA256_BLOCK_BITS/8);
 	if (kl > SHA256_BLOCK_BITS){
 		sha256((void*)buffer, key, kl);
 	} else {
@@ -61,7 +63,8 @@ void hmac_sha256_final(hmac_sha256_ctx_t *s, void* key, uint16_t kl){
 	sha256_init(&a);
 	sha256_nextBlock(&a, buffer); /* hash key ^ opad */
 	sha256_ctx2hash((void*)buffer, s);  /* copy hash(key ^ ipad, msg) to buffer */
-	sha256_lastBlock(s, buffer, SHA256_HASH_BITS);
+	sha256_lastBlock(&a, buffer, SHA256_HASH_BITS);
+	memcpy(s, &a, sizeof(sha256_ctx_t));
 #if defined SECURE_WIPE_BUFFER
 	memset(buffer, 0, SHA256_BLOCK_BITS/8);
 	memset(a.h, 0, 8*4);