X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=shabea.c;h=49a13215b18de29dfa8827504f46aef574ea257a;hb=f6e331f76599dbb9b3bb82fb9600bbc4410b77bb;hp=7acb4d3f9b9be78a2b2d80a5657e3208a2cba3e2;hpb=2b3e134485c42a28f4d8d981c8cb62dc27e71aa5;p=avr-crypto-lib.git

diff --git a/shabea.c b/shabea.c
index 7acb4d3..49a1321 100644
--- a/shabea.c
+++ b/shabea.c
@@ -1,3 +1,21 @@
+/* shabea.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 <http://www.gnu.org/licenses/>.
+*/
 /**
  * \file	shabea.c
  * \author	Daniel Otte 
@@ -37,26 +55,26 @@ void memxor(uint8_t * dest, uint8_t * src, uint8_t length){
 
 #define L ((uint8_t*)block+ 0)
 #define R ((uint8_t*)block+16)
-void shabea256(void * block, void * key, uint16_t keysize, uint8_t enc, uint8_t rounds){
+void shabea256(void * block, void * key, uint16_t keysize_b, uint8_t enc, uint8_t rounds){
 	int8_t r;		/**/
-	uint8_t tb[HALFSIZEB+2+(keysize+7)/8];	/**/
+	uint8_t tb[HALFSIZEB+2+(keysize_b+7)/8];	/**/
 	uint16_t kbs;	/* bytes used for the key / temporary block */
 	sha256_hash_t hash;
 	
 	r = (enc?0:(rounds-1));
-	kbs = (keysize+7)/8;
+	kbs = (keysize_b+7)/8;
 	memcpy(tb+HALFSIZEB+2, key, kbs); /* copy key to temporary block */
 	tb[HALFSIZEB+0] = 0;	/* set round counter high value to zero */
 	
 	for(;r!=(enc?(rounds):-1);enc?r++:r--){ /* enc: 0..(rounds-1) ; !enc: (rounds-1)..0 */
 		memcpy(tb, R, HALFSIZEB); /* copy right half into tb */
 		tb[HALFSIZEB+1] = r;
-		sha256(&hash, tb, HALFSIZE+16+keysize);
+		sha256(&hash, tb, HALFSIZE+16+keysize_b);
 		if(!(r==(enc?(rounds-1):0))){	
 			/* swap */
-			memxor(hash, L, HALFSIZE);
-			memcpy(L, R, HALFSIZE);
-			memcpy(R, hash, HALFSIZE);
+			memxor(hash, L, HALFSIZEB);
+			memcpy(L, R, HALFSIZEB);
+			memcpy(R, hash, HALFSIZEB);
 		} else {
 			/* no swap */
 			memxor(L, hash, HALFSIZE);