#include <string.h>
#include <avr/pgmspace.h>
#include "memxor.h"
+#include "rotate64.h"
#include "keccak.h"
#ifdef DEBUG
#define DEBUG 0
-
#if DEBUG
#include "cli.h"
#endif
-static uint64_t rc[] PROGMEM = {
+/*
+const uint64_t rc[] PROGMEM = {
0x0000000000000001LL, 0x0000000000008082LL,
0x800000000000808ALL, 0x8000000080008000LL,
0x000000000000808BLL, 0x0000000080000001LL,
0x8000000080008081LL, 0x8000000000008080LL,
0x0000000080000001LL, 0x8000000080008008LL
};
+*/
-uint64_t rotl64(uint64_t a, uint8_t r){
- return (a<<r)|(a>>(64-r));
-}
+const static uint8_t rc_comp[] PROGMEM = {
+ 0x01, 0x92, 0xda, 0x70,
+ 0x9b, 0x21, 0xf1, 0x59,
+ 0x8a, 0x88, 0x39, 0x2a,
+ 0xbb, 0xcb, 0xd9, 0x53,
+ 0x52, 0xc0, 0x1a, 0x6a,
+ 0xf1, 0xd0, 0x21, 0x78,
+};
-static uint8_t r[5][5] PROGMEM = {
- { 0, 36, 3, 41, 18 },
- { 1, 44, 10, 45, 2 },
- { 62, 6, 43, 15, 61 },
- { 28, 55, 25, 21, 56 },
- { 27, 20, 39, 8, 14 }
+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) }
};
+static inline
void keccak_round(uint64_t a[5][5], uint8_t rci){
uint64_t b[5][5];
- uint8_t i,j;
+ uint8_t i, j;
+ union {
+ uint64_t v64;
+ uint8_t v8[8];
+ } t;
/* theta */
- for(i=0; i<5; ++i){
+ for(i = 0; i < 5; ++i){
b[i][0] = a[0][i] ^ a[1][i] ^ a[2][i] ^ a[3][i] ^ a[4][i];
}
- for(i=0; i<5; ++i){
- b[i][1] = b[(4+i)%5][0] ^ rotl64(b[(i+1)%5][0], 1);
- }
- for(i=0; i<5; ++i){
- for(j=0; j<5; ++j){
- a[j][i] ^= b[i][1];
+ 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
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] = rotl64(a[j][i], pgm_read_byte(&(r[i][j])));
+ 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
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]));
+ 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
keccak_dump_state(a);
#endif
/* iota */
- uint64_t t;
- memcpy_P(&t, &(rc[rci]), 8);
- a[0][0] ^= t;
+
+// 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
cli_putstr_P(PSTR("\r\nAfter iota:"));
keccak_dump_state(a);
}
void keccak_f1600(uint64_t a[5][5]){
- uint8_t i=0;
- do{
+ 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);
+ } while (++i < 24);
}
void keccak_nextBlock(keccak_ctx_t* ctx, const void* block){
memset(tmp, 0x00, ctx->bs);
memcpy(tmp, block, (length_b+7)/8);
/* appand 1 */
- if(length_b&7){
+ if(length_b & 7){
/* we have some single bits */
uint8_t t;
- t = tmp[length_b/8]>>(8-(length_b&7));
- t |= 0x01<<(length_b&7);
- tmp[length_b/8] = t;
+ t = tmp[length_b / 8] >> (8 - (length_b & 7));
+ t |= 0x01 << (length_b & 7);
+ tmp[length_b / 8] = t;
}else{
- tmp[length_b/8] = 0x01;
+ tmp[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);
+ if(length_b / 8 + 1 + 3 <= ctx->bs){
+ memcpy(tmp + length_b / 8 + 1, pad, 3);
}else{
- if(length_b/8+1+2<=ctx->bs){
+ 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;
+ tmp[0] = 0x01;
}else{
- if(length_b/8+1+1<=ctx->bs){
- memcpy(tmp+length_b/8+1, pad, 1);
+ 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;
}
/*
-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
+ 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);
+ memset(ctx->a, 0x00, 5 * 5 * 8);
ctx->r = r;
ctx->c = c;
ctx->d = d;
- ctx->bs = (uint8_t)(r/8);
+ ctx->bs = (uint8_t)(r / 8);
}
void keccak224_init(keccak_ctx_t* ctx){