X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=skipjack.c;h=04eb437a00edb18d2bc77ffae2cf5ffa974f4c5a;hb=52ec168ece9d61bd9cb652235dfe8faee6232a11;hp=3a610fc1d5404be93b3c5bc89e56cee0fc347178;hpb=96ebafd201c9e8441c7677577b24aa402c1defc6;p=avr-crypto-lib.git

diff --git a/skipjack.c b/skipjack.c
index 3a610fc..04eb437 100644
--- a/skipjack.c
+++ b/skipjack.c
@@ -1,6 +1,6 @@
 /* skipjack.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    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
@@ -30,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 ={ 
@@ -102,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);
 }
 
 /*****************************************************************************/
@@ -113,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);
 }
 
 /*****************************************************************************/
@@ -123,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);
 }
 
@@ -135,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);
 }
 
 /*****************************************************************************/