X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=keccak%2Fkeccak-stub.c;h=886e2d199716cf391cae2aa2aab209270493c481;hb=306468ce9c4073b85c3d9431da13739a01e6d752;hp=5b9e3c48f6485575287fa98c1de775e476b4125e;hpb=6a1c5e57c5aaa60e7f859893866acc7a0c5c6f22;p=avr-crypto-lib.git diff --git a/keccak/keccak-stub.c b/keccak/keccak-stub.c index 5b9e3c4..886e2d1 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, @@ -88,98 +72,15 @@ const static uint8_t rc_comp[] PROGMEM = { 0xf1, 0xd0, 0x21, 0x78, }; -const static uint8_t r[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 - 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){ - t.v64 = b[(4 + i) % 5][0] ^ rotate64_1bit_left(b[(i + 1) % 5][0]); - for(j = 0; j < 5; ++j){ - a[j][i] ^= t.v64; - } - } -#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); @@ -187,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){