X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=keccak%2Fkeccak-stub.c;h=14c91df774efb3072aa4a72d1c69ca0e256d81b6;hb=5a83cf2b010b74721dec56d940dcf457fae24205;hp=5f3927d1a2632be2bdb17eabc7f416644f3699cd;hpb=c224e9cb51793990ed6fb2afd7529ff3d6bf72c9;p=avr-crypto-lib.git

diff --git a/keccak/keccak-stub.c b/keccak/keccak-stub.c
index 5f3927d..14c91df 100644
--- a/keccak/keccak-stub.c
+++ b/keccak/keccak-stub.c
@@ -23,131 +23,13 @@
 #include "memxor.h"
 #include "keccak.h"
 
-#ifdef DEBUG
-#  undef DEBUG
-#endif
-
-#define DEBUG 0
-
-#if DEBUG
-#include "cli.h"
-#include "stdio.h"
-
-void keccak_dump_state(uint64_t a[5][5]){
-	uint8_t i,j;
-	for(i=0; i<5; ++i){
-		cli_putstr_P(PSTR("\r\n"));
-		cli_putc('0'+i);
-		cli_putstr_P(PSTR(": "));
-		for(j=0; j<5; ++j){
-			cli_hexdump_rev(&(a[i][j]), 8);
-			cli_putc(' ');
-		}
-	}
-}
-
-void keccak_dump_ctx(keccak_ctx_t* ctx){
-	keccak_dump_state(ctx->a);
-	cli_putstr_P(PSTR("\r\nDBG: r: "));
-	cli_hexdump_rev(&(ctx->r), 2);
-	cli_putstr_P(PSTR("\t c: "));
-	cli_hexdump_rev(&(ctx->c), 2);
-	cli_putstr_P(PSTR("\t d: "));
-	cli_hexdump(&(ctx->d), 1);
-	cli_putstr_P(PSTR("\t bs: "));
-	cli_hexdump(&(ctx->bs), 1);
-}
-
-#endif
-
-void keccak_f1600(uint64_t a[5][5]);
-
+/*
+//void keccak_f1600(uint8_t a[200]);
+void keccak_lastBlock_f1(keccak_ctx_t* ctx, const void* block, uint16_t length_b);
 void keccak_lastBlock(keccak_ctx_t* ctx, const void* block, uint16_t length_b){
-	while(length_b >= ctx->r){
-		keccak_nextBlock(ctx, block);
-		block = (uint8_t*)block + ctx->bs;
-		length_b -=  ctx->r;
-	}
-	memxor(ctx->a, block, (length_b)/8);
-	/* append 1 */
-	if(length_b & 7){
-		/* we have some single bits */
-		uint8_t t;
-		t = ((uint8_t*)block)[length_b / 8] >> (8 - (length_b & 7));
-		t |= 0x01 << (length_b & 7);
-		((uint8_t*)ctx->a)[length_b / 8] ^= t;
-	}else{
-	    ((uint8_t*)ctx->a)[length_b / 8] ^= 0x01;
-	}
-	if(length_b / 8 + 1 + 3 <= ctx->bs){
-        *((uint8_t*)ctx->a + length_b / 8 + 1) ^= ctx->d;
-        *((uint8_t*)ctx->a + length_b / 8 + 2) ^= ctx->bs;
-        *((uint8_t*)ctx->a + length_b / 8 + 3) ^= 1;
-	}else{
-		if(length_b / 8 + 1 + 2 <= ctx->bs){
-            *((uint8_t*)ctx->a + length_b / 8 + 1) ^= ctx->d;
-            *((uint8_t*)ctx->a + length_b / 8 + 2) ^= ctx->bs;
-			keccak_f1600(ctx->a);
-			((uint8_t*)ctx->a)[0] ^= 0x01;
-		}else{
-			if(length_b/8+1+1 <= ctx->bs){
-				*((uint8_t*)ctx->a + length_b / 8 + 1) ^= ctx->d;
-				keccak_f1600(ctx->a);
-				((uint8_t*)ctx->a)[0] ^= ctx->bs;
-				((uint8_t*)ctx->a)[1] ^= 0x01;
-			}else{
-				keccak_f1600(ctx->a);
-				((uint8_t*)ctx->a)[0] ^= ctx->d;
-				((uint8_t*)ctx->a)[1] ^= ctx->bs;
-				((uint8_t*)ctx->a)[2] ^= 0x01;
-			}
-		}
-	}
-	keccak_f1600(ctx->a);
-}
-
-void keccak224_ctx2hash(void* dest, keccak_ctx_t* ctx){
-	keccak_ctx2hash(dest, 224, ctx);
-}
-
-void keccak256_ctx2hash(void* dest, keccak_ctx_t* ctx){
-	keccak_ctx2hash(dest, 256, ctx);
+    keccak_lastBlock_f1(ctx, block, length_b);
+ //   ctx->a[ctx->bs - 1] ^= 0x80;
+ //   keccak_f1600(ctx->a);
 }
 
-void keccak384_ctx2hash(void* dest, keccak_ctx_t* ctx){
-	keccak_ctx2hash(dest, 384, ctx);
-}
-
-void keccak512_ctx2hash(void* dest, keccak_ctx_t* ctx){
-	keccak_ctx2hash(dest, 512, ctx);
-}
-
-/*
-  1. SHA3-224: ⌊Keccak[r = 1152, c =  448, d = 28]⌋224
-  2. SHA3-256: ⌊Keccak[r = 1088, c =  512, d = 32]⌋256
-  3. SHA3-384: ⌊Keccak[r =  832, c =  768, d = 48]⌋384
-  4. SHA3-512: ⌊Keccak[r =  576, c = 1024, d = 64]⌋512
 */
-void keccak_init(uint16_t r, uint16_t c, uint8_t d, keccak_ctx_t* ctx){
-	memset(ctx->a, 0x00, 5 * 5 * 8);
-	ctx->r = r;
-	ctx->c = c;
-	ctx->d = d;
-	ctx->bs = (uint8_t)(r / 8);
-}
-
-void keccak224_init(keccak_ctx_t* ctx){
-	keccak_init(1152, 448, 28, ctx);
-}
-
-void keccak256_init(keccak_ctx_t* ctx){
-	keccak_init(1088, 512, 32, ctx);
-}
-
-void keccak384_init(keccak_ctx_t* ctx){
-	keccak_init( 832, 768, 48, ctx);
-}
-
-void keccak512_init(keccak_ctx_t* ctx){
-	keccak_init( 576, 1024, 64, ctx);
-}