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

removing debugging stuff from keccak

This commit is contained in:
bg 2010-02-11 13:44:50 +00:00
parent 1b51cba0fd
commit 2f9c4bbbec
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
keccak/keccak.c
View File

@ -24,13 +24,11 @@
#include "memxor.h"
#include "keccak.h"
#define W 64
#ifdef DEBUG
# undef DEBUG
#endif
#define DEBUG 1
#define DEBUG 0
#if DEBUG
@ -63,8 +61,6 @@ void keccak_dump_ctx(keccak_ctx_t* ctx){
#endif
#undef DEBUG
static uint64_t rc[] PROGMEM = {
0x0000000000000001LL, 0x0000000000008082LL,
0x800000000000808ALL, 0x8000000080008000LL,
@ -93,18 +89,18 @@ static uint8_t r[5][5] PROGMEM = {
};
void keccak_round(uint64_t a[5][5], uint8_t rci){
uint64_t c[5], d[5], b[5][5];
uint64_t b[5][5];
uint8_t i,j;
/* theta */
for(i=0; i<5; ++i){
c[i] = a[0][i] ^ a[1][i] ^ a[2][i] ^ a[3][i] ^ a[4][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){
d[i] = c[(4+i)%5] ^ rotl64(c[(i+1)%5], 1);
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] ^= d[i];
a[j][i] ^= b[i][1];
}
}
#if DEBUG
@ -206,7 +202,6 @@ void keccak_lastBlock(keccak_ctx_t* ctx, const void* block, uint16_t length_b){
}
}
keccak_nextBlock(ctx, tmp);
keccak_dump_ctx(ctx);
}
void keccak_ctx2hash(void* dest, uint16_t length_b, keccak_ctx_t* ctx){

2
keccak/keccak.h
View File

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