X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=keccak%2Fkeccak-stub.c;h=ff198e7c3fe692b0af74880e4b8779f63881abc2;hb=ddc66bc0543c50a0f36a3c26abf90dfef36dc3d9;hp=5927614e001870d833377a4153c9f8f50f5adc54;hpb=4128060fcc4585ab8f40d01486baa4248b499160;p=avr-crypto-lib.git

diff --git a/keccak/keccak-stub.c b/keccak/keccak-stub.c
index 5927614..ff198e7 100644
--- a/keccak/keccak-stub.c
+++ b/keccak/keccak-stub.c
@@ -62,24 +62,8 @@ void keccak_dump_ctx(keccak_ctx_t* ctx){
 
 #endif
 
-/*
-const uint64_t rc[] PROGMEM = {
-       0x0000000000000001LL, 0x0000000000008082LL,
-       0x800000000000808ALL, 0x8000000080008000LL,
-       0x000000000000808BLL, 0x0000000080000001LL,
-       0x8000000080008081LL, 0x8000000000008009LL,
-       0x000000000000008ALL, 0x0000000000000088LL,
-       0x0000000080008009LL, 0x000000008000000ALL,
-       0x000000008000808BLL, 0x800000000000008BLL,
-       0x8000000000008089LL, 0x8000000000008003LL,
-       0x8000000000008002LL, 0x8000000000000080LL,
-       0x000000000000800ALL, 0x800000008000000ALL,
-       0x8000000080008081LL, 0x8000000000008080LL,
-       0x0000000080000001LL, 0x8000000080008008LL
-};
-*/
 
-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,15 +71,7 @@ const static uint8_t rc_comp[] PROGMEM = {
 		0x52, 0xc0, 0x1a, 0x6a,
 		0xf1, 0xd0, 0x21, 0x78,
 };
-/*
-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) },
@@ -104,96 +80,7 @@ const uint8_t keccak_rotate_codes[5][5] PROGMEM = {
         { ROT_CODE(18), ROT_CODE( 2), ROT_CODE(61), ROT_CODE(56), ROT_CODE(14) }
 };
 
-void keccak_theta(uint64_t *a, uint64_t *b);
-extern const uint8_t rho_pi_idx_table[25] PROGMEM;
-
-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 */
-	keccak_theta((uint64_t*)a, (uint64_t*)b);
-#if DEBUG
-	cli_putstr_P(PSTR("\r\nAfter theta:"));
-	keccak_dump_state(a);
-#endif
-	/* rho & pi */
-/*
-	const uint8_t* rot_code = (const uint8_t*)keccak_rotate_codes;
-    const uint8_t* idx_idx = (const uint8_t*)rho_pi_idx_table;
-    uint64_t *a_tmp = (uint64_t*)a;
-	for(i = 0; i < 25; ++i){
-		    *((uint64_t*)(((uint8_t*)b) + pgm_read_byte(idx_idx++))) =
-                rotate64left_code(*a_tmp++, pgm_read_byte(rot_code++));
-
-	}
-*/
-#if DEBUG & 0
-	cli_putstr_P(PSTR("\r\n--- after rho & pi ---"));
-	keccak_dump_state(a);
-#endif
-	/* chi */
-//	memcpy(a, b, 5 * 5 * 8);
-//	for(i = 1; i < 5; ++i){
-/*
-		for(j = 0; j < 5; ++j){
-			a[i][j] =  b[i][j] ^ ((~(b[i][(j + 1) % 5])) & (b[i][(j + 2) % 5]));
-		}
-* /
-//	      a[i][0] ^= ((~(b[i][1])) & (b[i][2]));
-//        a[i][1] ^= ((~(b[i][2])) & (b[i][3]));
-//        a[i][2] ^= ((~(b[i][3])) & (b[i][4]));
-        for(j = 0; j < 3 * 8; ++j){
-            ((uint8_t*)a)[i * 5 * 8 + j] ^=
-                (~((uint8_t*)b)[i * 5 * 8 + j + 8]) & ((uint8_t*)a)[i * 5 * 8 + j + 16];
-        }
-        a[i][3] ^= ((~(b[i][4])) & (b[i][0]));
-        a[i][4] ^= ((~(b[i][0])) & (b[i][1]));
-
-	}
-*/
-#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);