X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=hmac-sha256.c;h=274c9c470e5f0acf441653d1a99de000f6224d8b;hb=3b6caf79acc2653f594f2a62d4c220f78660d89e;hp=3483f1224957cf5902244420328873c2d365d550;hpb=3c995d0a8faeb9d37927d48e20fc45d839e066ea;p=avr-crypto-lib.git
diff --git a/hmac-sha256.c b/hmac-sha256.c
index 3483f12..274c9c4 100644
--- a/hmac-sha256.c
+++ b/hmac-sha256.c
@@ -1,9 +1,27 @@
+/* hmac-sha256.c */
+/*
+ This file is part of the Crypto-avr-lib/microcrypt-lib.
+ Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
/**
*
* implementation of HMAC as described in RFC2104
- * Author: Daniel Otte
- *
- * License: GPL
+ * Author: Daniel Otte
+ * email: daniel.otte@rub.de
+ * License: GPLv3 or later
**/
/*
@@ -12,6 +30,7 @@
#include
#include
+#include "config.h"
#include "sha256.h"
#define IPAD 0x36
@@ -19,52 +38,59 @@
typedef sha256_ctx_t hmac_sha256_ctx_t;
-void hmac_sha256_init(hmac_sha256_ctx_t *s, void* key, uint16_t kl){
- uint8_t buffer[SHA256_BLOCK_BITS/8];
+#ifndef HMAC_SHORTONLY
+
+void hmac_sha256_init(hmac_sha256_ctx_t *s, void* key, uint16_t keylength_b){
+ uint8_t buffer[SHA256_HASH_BYTES];
uint8_t i;
- if (kl > SHA256_BLOCK_BITS){
- sha256((void*)buffer, key, kl);
+ memset(buffer, 0, SHA256_HASH_BYTES);
+ if (keylength_b > SHA256_BLOCK_BITS){
+ sha256((void*)buffer, key, keylength_b);
} else {
- memcpy(buffer, key, kl/8 + (kl & 0x7)?1:0);
+ memcpy(buffer, key, (keylength_b+7)/8);
}
- for (i=0; i SHA256_BLOCK_BITS){
- sha256((void*)buffer, key, kl);
+ memset(buffer, 0, SHA256_HASH_BYTES);
+ if (keylength_b > SHA256_BLOCK_BITS){
+ sha256((void*)buffer, key, keylength_b);
} else {
- memcpy(buffer, key, kl/8 + (kl & 0x7)?1:0);
+ memcpy(buffer, key, (keylength_b+7)/8);
}
- for (i=0; i SHA256_BLOCK_BITS){
- sha256((void*)buffer, key, kl);
+ if (keylength_b > SHA256_BLOCK_BITS){
+ sha256((void*)buffer, key, keylength_b);
} else {
- memcpy(buffer, key, kl/8 + (kl & 0x7)?1:0);
+ memcpy(buffer, key, (keylength_b+7)/8);
}
- for (i=0; i= SHA256_BLOCK_BITS){
+ while (msglength_b >= SHA256_BLOCK_BITS){
sha256_nextBlock(&s, msg);
- msg += SHA256_BLOCK_BITS/8;
- ml -= SHA256_BLOCK_BITS;
+ msg = (uint8_t*)msg + SHA256_HASH_BYTES;
+ msglength_b -= SHA256_BLOCK_BITS;
}
- sha256_lastBlock(&s, msg, ml);
+ sha256_lastBlock(&s, msg, msglength_b);
/* since buffer still contains key xor ipad we can do ... */
- for (i=0; i