[keccak-asm] improving last block handling (reducing stack space)

[avr-crypto-lib.git] / keccak / keccak-stub.c

diff --git a/keccak/keccak-stub.c b/keccak/keccak-stub.c
index 4e5a58abe7cce5569a1527eaf9b1a182f9064be0..886e2d199716cf391cae2aa2aab209270493c481 100644 (file)
--- a/keccak/keccak-stub.c
+++ b/keccak/keccak-stub.c
@@ -62,22 +62,6 @@ 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 uint8_t keccak_rc_comp[] PROGMEM = {
                0x01, 0x92, 0xda, 0x70,
@@ -87,15 +71,7 @@ const uint8_t keccak_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) },
@@ -112,53 +88,50 @@ void keccak_nextBlock(keccak_ctx_t* ctx, const void* block){
 }
 
 void keccak_lastBlock(keccak_ctx_t* ctx, const void* block, uint16_t length_b){
-       while(length_b>=ctx->r){
+       while(length_b >= ctx->r){
                keccak_nextBlock(ctx, block);
                block = (uint8_t*)block + ctx->bs;
                length_b -=  ctx->r;
        }
-       uint8_t tmp[ctx->bs];
+//     uint8_t tmp[ctx->bs];
        uint8_t pad[3];
-       memset(tmp, 0x00, ctx->bs);
-       memcpy(tmp, block, (length_b+7)/8);
+//     memset(tmp, 0x00, ctx->bs);
+       memxor(ctx->a, block, (length_b)/8);
        /* appand 1 */
        if(length_b & 7){
                /* we have some single bits */
                uint8_t t;
-               t = tmp[length_b / 8] >> (8 - (length_b & 7));
+               t = ((uint8_t*)block)[length_b / 8] >> (8 - (length_b & 7));
                t |= 0x01 << (length_b & 7);
-               tmp[length_b / 8] = t;
+               ((uint8_t*)ctx->a)[length_b / 8] ^= t;
        }else{
-               tmp[length_b / 8] = 0x01;
+           ((uint8_t*)ctx->a)[length_b / 8] ^= 0x01;
        }
        pad[0] = ctx->d;
        pad[1] = ctx->bs;
        pad[2] = 0x01;
        if(length_b / 8 + 1 + 3 <= ctx->bs){
-               memcpy(tmp + length_b / 8 + 1, pad, 3);
+               memxor((uint8_t*)ctx->a + length_b / 8 + 1, pad, 3);
        }else{
                if(length_b / 8 + 1 + 2 <= ctx->bs){
-                       memcpy(tmp+length_b/8+1, pad, 2);
-                       keccak_nextBlock(ctx, tmp);
-                       memset(tmp, 0x00, ctx->bs);
-                       tmp[0] = 0x01;
+                       memxor((uint8_t*)ctx->a + length_b / 8 + 1, pad, 2);
+                       keccak_f1600(ctx->a);
+                       ((uint8_t*)ctx->a)[0] ^= 0x01;
                }else{
                        if(length_b/8+1+1 <= ctx->bs){
-                               memcpy(tmp + length_b / 8 + 1, pad, 1);
-                               keccak_nextBlock(ctx, tmp);
-                               memset(tmp, 0x00, ctx->bs);
-                               tmp[0] = ctx->bs;
-                               tmp[1] = 0x01;
+                               memxor((uint8_t*)ctx->a + length_b / 8 + 1, pad, 1);
+                               keccak_f1600(ctx->a);
+                               ((uint8_t*)ctx->a)[0] ^= ctx->bs;
+                               ((uint8_t*)ctx->a)[1] ^= 0x01;
                        }else{
-                               keccak_nextBlock(ctx, tmp);
-                               memset(tmp, 0x00, ctx->bs);
-                               tmp[0] = ctx->d;
-                               tmp[1] = ctx->bs;
-                               tmp[2] = 0x01;
+                               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_nextBlock(ctx, tmp);
+       keccak_f1600(ctx->a);
 }
 
 void keccak_ctx2hash(void* dest, uint16_t length_b, keccak_ctx_t* ctx){