new hash function abstraction layer + shavs + dump util + ...

[avr-crypto-lib.git] / skipjack.c

diff --git a/skipjack.c b/skipjack.c
index 36792d7c9415206cec6356775872c76ec984244a..04eb437a00edb18d2bc77ffae2cf5ffa974f4c5a 100644 (file)
--- a/skipjack.c
+++ b/skipjack.c
@@ -1,3 +1,21 @@
+/* skipjack.c */
+/*
+    This file is part of the AVR-Crypto-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/>.
+*/
 /**
  * 
  * 
@@ -12,6 +30,14 @@
 #include <avr/io.h>
 #include <avr/pgmspace.h>
 
+#define SKIPJACK_CNT_BIG
+
+#ifdef SKIPJACK_CNT_BIG
+  #define SKIPJACK_CNT_SHIFT <<8
+#else
+  #define SKIPJACK_CNT_SHIFT
+#endif
+
 /*****************************************************************************/
 
 uint8_t skipjack_ftable[] PROGMEM ={ 
@@ -84,7 +110,7 @@ void skipjack_a(uint16_t* w, uint8_t k, uint8_t* key){
        w[3] = w[2];
        w[2] = w[1];
        w[1] = skipjack_g(w[0],k-1,key);
-       w[0] = t ^ w[1] ^ k<<8;
+       w[0] = t ^ w[1] ^ (((uint16_t)k)SKIPJACK_CNT_SHIFT);
 }
 
 /*****************************************************************************/
@@ -95,7 +121,7 @@ void skipjack_a_inv(uint16_t* w, uint8_t k, uint8_t* key){
        w[0] = skipjack_g_inv(w[1],k-1,key);
        w[1] = w[2];
        w[2] = w[3];
-       w[3] = t ^ k<<8;
+       w[3] = t ^ (((uint16_t)k)SKIPJACK_CNT_SHIFT);
 }
 
 /*****************************************************************************/
@@ -105,7 +131,7 @@ void skipjack_b(uint16_t* w, uint8_t k, uint8_t* key){
        t = w[0];
        w[0] = w[3];
        w[3] = w[2];
-       w[2] = t ^ k<<8 ^ w[1];
+       w[2] = t ^ (((uint16_t)k)SKIPJACK_CNT_SHIFT) ^ w[1];
        w[1] = skipjack_g(t,k-1,key);
 }
 
@@ -117,7 +143,7 @@ void skipjack_b_inv(uint16_t* w, uint8_t k, uint8_t* key){
        w[2] = w[3];
        w[3] = w[0];
        w[0] = skipjack_g_inv(w[1],k-1,key);
-       w[1] = w[0] ^ t ^ k<<8;
+       w[1] = w[0] ^ t ^ (((uint16_t)k)SKIPJACK_CNT_SHIFT);
 }
 
 /*****************************************************************************/