bg
/
avr-crypto-lib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[keccak-c] fixing

This commit is contained in:
bg 2013-01-12 18:04:32 +01:00
parent 628319e6c3
commit cd50f65c37
2 changed files with 38 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
keccak/keccak.c
View File

@ -96,7 +96,7 @@ const static uint8_t r[5][5] PROGMEM = {
}; };
static inline static inline
void keccak_round(uint64_t a[5][5], uint8_t rci){ void keccak_round(uint64_t *a, uint8_t rci){
uint64_t b[5][5]; uint64_t b[5][5];
uint8_t i, j; uint8_t i, j;
union { union {
@ -105,12 +105,12 @@ void keccak_round(uint64_t a[5][5], uint8_t rci){
} t; } t;
/* theta */ /* 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]; b[i][0] = a[i] ^ a[5 + i] ^ a[10 + i] ^ a[15 + i] ^ a[20 + i];
} }
for(i = 0; i < 5; ++i){ for(i = 0; i < 5; ++i){
t.v64 = b[(4 + i) % 5][0] ^ rotate64_1bit_left(b[(i + 1) % 5][0]); t.v64 = b[(4 + i) % 5][0] ^ rotate64_1bit_left(b[(i + 1) % 5][0]);
for(j = 0; j < 5; ++j){ for(j = 0; j < 5; ++j){
a[j][i] ^= t.v64; a[j * 5 + i] ^= t.v64;
} }
} }
#if DEBUG #if DEBUG
@ -120,7 +120,7 @@ void keccak_round(uint64_t a[5][5], uint8_t rci){
/* rho & pi */ /* rho & pi */
for(i = 0; i < 5; ++i){ for(i = 0; i < 5; ++i){
for(j = 0; j < 5; ++j){ for(j = 0; j < 5; ++j){
b[(2 * i + 3 * j) % 5][j] = rotate64left_code(a[j][i], pgm_read_byte(&(r[i][j]))); b[(2 * i + 3 * j) % 5][j] = rotate64left_code(a[j * 5 +i], pgm_read_byte(&(r[i][j])));
} }
} }
#if DEBUG #if DEBUG
@ -130,7 +130,7 @@ void keccak_round(uint64_t a[5][5], uint8_t rci){
/* chi */ /* chi */
for(i = 0; i < 5; ++i){ for(i = 0; i < 5; ++i){
for(j = 0; j < 5; ++j){ for(j = 0; j < 5; ++j){
a[j][i] = b[j][i] ^ ((~(b[j][(i + 1) % 5])) & (b[j][(i + 2) % 5])); a[j * 5 + i] = b[j][i] ^ ((~(b[j][(i + 1) % 5])) & (b[j][(i + 2) % 5]));
} }
} }
#if DEBUG #if DEBUG
@ -153,14 +153,14 @@ void keccak_round(uint64_t a[5][5], uint8_t rci){
} }
t.v8[0] &= 0x8F; t.v8[0] &= 0x8F;
a[0][0] ^= t.v64; a[0] ^= t.v64;
#if DEBUG #if DEBUG
cli_putstr_P(PSTR("\r\nAfter iota:")); cli_putstr_P(PSTR("\r\nAfter iota:"));
keccak_dump_state(a); keccak_dump_state(a);
#endif #endif
} }
void keccak_f1600(uint64_t a[5][5]){ void keccak_f1600(void* a){
uint8_t i = 0; uint8_t i = 0;
do { do {
#if DEBUG #if DEBUG
@ -168,7 +168,7 @@ void keccak_f1600(uint64_t a[5][5]){
cli_hexdump(&i, 1); cli_hexdump(&i, 1);
cli_putstr_P(PSTR(" ---")); cli_putstr_P(PSTR(" ---"));
#endif #endif
keccak_round(a, i); keccak_round((uint64_t*)a, i);
} while (++i < 24); } while (++i < 24);
} }
@ -178,57 +178,33 @@ void keccak_nextBlock(keccak_ctx_t* ctx, const void* block){
} }
void keccak_lastBlock(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){ uint8_t length_B;
keccak_nextBlock(ctx, block); while(length_b >= ctx->r){
block = (uint8_t*)block + ctx->bs; keccak_nextBlock(ctx, block);
length_b -= ctx->r; block = (uint8_t*)block + ctx->bs;
} length_b -= ctx->r;
uint8_t tmp[ctx->bs]; }
uint8_t pad[3]; length_B = length_b / 8;
memset(tmp, 0x00, ctx->bs); memxor(ctx->a, block, length_B);
memcpy(tmp, block, (length_b+7)/8); /* append 1 */
/* appand 1 */ if(length_b & 7){
if(length_b & 7){ /* we have some single bits */
/* we have some single bits */ uint8_t t;
uint8_t t; t = ((uint8_t*)block)[length_B] >> (8 - (length_b & 7));
t = tmp[length_b / 8] >> (8 - (length_b & 7)); t |= 0x01 << (length_b & 7);
t |= 0x01 << (length_b & 7); ctx->a[length_B] ^= t;
tmp[length_b / 8] = t; }else{
}else{ ctx->a[length_B] ^= 0x01;
tmp[length_b / 8] = 0x01; }
} if(length_b == ctx->r - 1){
pad[0] = ctx->d; keccak_f1600(ctx->a);
pad[1] = ctx->bs; }
pad[2] = 0x01; ctx->a[ctx->bs - 1] ^= 0x80;
if(length_b / 8 + 1 + 3 <= ctx->bs){ keccak_f1600(ctx->a);
memcpy(tmp + 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;
}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;
}else{
keccak_nextBlock(ctx, tmp);
memset(tmp, 0x00, ctx->bs);
tmp[0] = ctx->d;
tmp[1] = ctx->bs;
tmp[2] = 0x01;
}
}
}
keccak_nextBlock(ctx, tmp);
} }
void keccak_ctx2hash(void* dest, uint16_t length_b, keccak_ctx_t* ctx){ void keccak_ctx2hash(void* dest, uint16_t length_b, keccak_ctx_t* ctx){
while(length_b>=ctx->r){ while(length_b >= ctx->r){
memcpy(dest, ctx->a, ctx->bs); memcpy(dest, ctx->a, ctx->bs);
dest = (uint8_t*)dest + ctx->bs; dest = (uint8_t*)dest + ctx->bs;
length_b -= ctx->r; length_b -= ctx->r;
@ -259,26 +235,24 @@ void keccak512_ctx2hash(void* dest, keccak_ctx_t* ctx){
3. SHA3-384: ⌊Keccak[r = 832, c = 768, d = 48]⌋384 3. SHA3-384: ⌊Keccak[r = 832, c = 768, d = 48]⌋384
4. SHA3-512: ⌊Keccak[r = 576, c = 1024, d = 64]⌋512 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){ void keccak_init(uint16_t r, keccak_ctx_t* ctx){
memset(ctx->a, 0x00, 5 * 5 * 8); memset(ctx->a, 0x00, 5 * 5 * 8);
ctx->r = r; 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){ void keccak224_init(keccak_ctx_t* ctx){
keccak_init(1152, 448, 28, ctx); keccak_init(1152, ctx);
} }
void keccak256_init(keccak_ctx_t* ctx){ void keccak256_init(keccak_ctx_t* ctx){
keccak_init(1088, 512, 32, ctx); keccak_init(1088, ctx);
} }
void keccak384_init(keccak_ctx_t* ctx){ void keccak384_init(keccak_ctx_t* ctx){
keccak_init( 832, 768, 48, ctx); keccak_init( 832, ctx);
} }
void keccak512_init(keccak_ctx_t* ctx){ void keccak512_init(keccak_ctx_t* ctx){
keccak_init( 576, 1024, 64, ctx); keccak_init( 576, ctx);
} }

2
keccak/keccak.h
View File

@ -38,7 +38,7 @@ typedef struct{
} keccak_ctx_t; } keccak_ctx_t;
void keccak_init(uint16_t r, uint16_t c, uint8_t d, keccak_ctx_t* ctx); void keccak_init(uint16_t r, keccak_ctx_t* ctx);
void keccak224_init(keccak_ctx_t* ctx); void keccak224_init(keccak_ctx_t* ctx);
void keccak256_init(keccak_ctx_t* ctx); void keccak256_init(keccak_ctx_t* ctx);
void keccak384_init(keccak_ctx_t* ctx); void keccak384_init(keccak_ctx_t* ctx);