X-Git-Url: https://git.cryptolib.org/avr-crypto-lib.git?a=blobdiff_plain;f=keccak%2Fkeccak-stub.c;h=4e5a58abe7cce5569a1527eaf9b1a182f9064be0;hb=e7925dc3d2f76b73f54df0e22f69f789715eff8a;hp=60cf2d19af227562f9500f59c95ad2aad8dae317;hpb=d8ce9856212f264bfce6c86747429a9ada136a0e;p=avr-crypto-lib.git

diff --git a/keccak/keccak-stub.c b/keccak/keccak-stub.c
index 60cf2d1..4e5a58a 100644
--- a/keccak/keccak-stub.c
+++ b/keccak/keccak-stub.c
@@ -30,7 +30,7 @@
 #  undef DEBUG
 #endif
 
-#define DEBUG 1
+#define DEBUG 0
 
 #if DEBUG
 #include "cli.h"
@@ -79,7 +79,7 @@ const uint64_t rc[] PROGMEM = {
 };
 */
 
-const static uint8_t rc_comp[] PROGMEM = {
+const uint8_t keccak_rc_comp[] PROGMEM = {
 		0x01, 0x92, 0xda, 0x70,
 		0x9b, 0x21, 0xf1, 0x59,
 		0x8a, 0x88, 0x39, 0x2a,
@@ -87,98 +87,24 @@ const static uint8_t rc_comp[] PROGMEM = {
 		0x52, 0xc0, 0x1a, 0x6a,
 		0xf1, 0xd0, 0x21, 0x78,
 };
-
-const static uint8_t r[5][5] PROGMEM = {
+/*
+const uint8_t keccak_rotate_codes[5][5] PROGMEM = {
 		{ ROT_CODE( 0), ROT_CODE(36), ROT_CODE( 3), ROT_CODE(41), ROT_CODE(18) },
 		{ ROT_CODE( 1), ROT_CODE(44), ROT_CODE(10), ROT_CODE(45), ROT_CODE( 2) },
 		{ ROT_CODE(62), ROT_CODE( 6), ROT_CODE(43), ROT_CODE(15), ROT_CODE(61) },
 		{ ROT_CODE(28), ROT_CODE(55), ROT_CODE(25), ROT_CODE(21), ROT_CODE(56) },
 		{ ROT_CODE(27), ROT_CODE(20), ROT_CODE(39), ROT_CODE( 8), ROT_CODE(14) }
 };
+*/
+const uint8_t keccak_rotate_codes[5][5] PROGMEM = {
+        { ROT_CODE( 0), ROT_CODE( 1), ROT_CODE(62), ROT_CODE(28), ROT_CODE(27) },
+        { ROT_CODE(36), ROT_CODE(44), ROT_CODE( 6), ROT_CODE(55), ROT_CODE(20) },
+        { ROT_CODE( 3), ROT_CODE(10), ROT_CODE(43), ROT_CODE(25), ROT_CODE(39) },
+        { ROT_CODE(41), ROT_CODE(45), ROT_CODE(15), ROT_CODE(21), ROT_CODE( 8) },
+        { ROT_CODE(18), ROT_CODE( 2), ROT_CODE(61), ROT_CODE(56), ROT_CODE(14) }
+};
 
-void keccak_theta(uint64_t *a, uint64_t *b);
-
-static inline
-void keccak_round(uint64_t a[5][5], uint8_t rci){
-	uint64_t b[5][5];
-	uint8_t i, j;
-	union {
-			uint64_t v64;
-			uint8_t v8[8];
-		} t;
-	/* theta */
-#if DEBUG & 0
-    printf_P(PSTR("\npre-theta(1):"));
-    keccak_dump_state(b);
-#endif
-	keccak_theta((uint64_t*)a, (uint64_t*)b);
-#if DEBUG
-    printf_P(PSTR("\npost-theta(1):"));
-	keccak_dump_state(b);
-#endif
-	for(i = 0; i < 5; ++i){
-        for(j = 0; j < 5; ++j){
-            a[j][i] ^= rotate64_1bit_left(b[(i + 1) % 5][0]);
-        }
-    }
-#if DEBUG
-	cli_putstr_P(PSTR("\r\nAfter theta:"));
-	keccak_dump_state(a);
-#endif
-	/* rho & pi */
-	for(i = 0; i < 5; ++i){
-		for(j = 0; j < 5; ++j){
-			b[(2 * i + 3 * j) % 5][j] = rotate64left_code(a[j][i], pgm_read_byte(&(r[i][j])));
-		}
-	}
-#if DEBUG & 0
-	cli_putstr_P(PSTR("\r\n--- after rho & pi ---"));
-	keccak_dump_state(a);
-#endif
-	/* chi */
-	for(i = 0; i < 5; ++i){
-		for(j = 0; j < 5; ++j){
-			a[j][i] =  b[j][i] ^ ((~(b[j][(i + 1) % 5])) & (b[j][(i + 2) % 5]));
-		}
-	}
-#if DEBUG & 0
-	cli_putstr_P(PSTR("\r\nAfter chi:"));
-	keccak_dump_state(a);
-#endif
-	/* iota */
-
-//	memcpy_P(&t, &(rc_comp[rci]), 8);
-	t.v64 = 0;
-	t.v8[0] = pgm_read_byte(&(rc_comp[rci]));
-	if(t.v8[0] & 0x40){
-		t.v8[7] = 0x80;
-	}
-	if(t.v8[0] & 0x20){
-		t.v8[3] = 0x80;
-	}
-	if(t.v8[0] & 0x10){
-		t.v8[1] = 0x80;
-	}
-	t.v8[0] &= 0x8F;
-
-	a[0][0] ^= t.v64;
-#if DEBUG & 0
-	cli_putstr_P(PSTR("\r\nAfter iota:"));
-	keccak_dump_state(a);
-#endif
-}
-
-void keccak_f1600(uint64_t a[5][5]){
-	uint8_t i = 0;
-	do {
-#if DEBUG
-		cli_putstr_P(PSTR("\r\n\r\n--- Round "));
-		cli_hexdump(&i, 1);
-		cli_putstr_P(PSTR(" ---"));
-#endif
-		keccak_round(a, i);
-	} while (++i < 24);
-}
+void keccak_f1600(uint64_t a[5][5]);
 
 void keccak_nextBlock(keccak_ctx_t* ctx, const void* block){
 	memxor(ctx->a, block, ctx->bs);