[keccak-asm] clean up

This commit is contained in:
bg 2013-01-12 23:22:59 +01:00
parent 2ef97287a9
commit c48e9f61be
1 changed files with 0 additions and 142 deletions

View File

@ -23,43 +23,6 @@
#include "memxor.h"
#include "keccak.h"
#ifdef DEBUG
# undef DEBUG
#endif
#define DEBUG 0
#if DEBUG
#include "cli.h"
#include "stdio.h"
void keccak_dump_state(uint64_t a[5][5]){
uint8_t i,j;
for(i=0; i<5; ++i){
cli_putstr_P(PSTR("\r\n"));
cli_putc('0'+i);
cli_putstr_P(PSTR(": "));
for(j=0; j<5; ++j){
cli_hexdump_rev(&(a[i][j]), 8);
cli_putc(' ');
}
}
}
void keccak_dump_ctx(keccak_ctx_t* ctx){
keccak_dump_state(ctx->a);
cli_putstr_P(PSTR("\r\nDBG: r: "));
cli_hexdump_rev(&(ctx->r), 2);
cli_putstr_P(PSTR("\t c: "));
cli_hexdump_rev(&(ctx->c), 2);
cli_putstr_P(PSTR("\t d: "));
cli_hexdump(&(ctx->d), 1);
cli_putstr_P(PSTR("\t bs: "));
cli_hexdump(&(ctx->bs), 1);
}
#endif
void keccak_f1600(uint8_t a[200]);
void keccak_lastBlock(keccak_ctx_t* ctx, const void* block, uint16_t length_b){
@ -88,109 +51,4 @@ void keccak_lastBlock(keccak_ctx_t* ctx, const void* block, uint16_t length_b){
keccak_f1600(ctx->a);
}
#if 0
void keccak_lastBlock(keccak_ctx_t* ctx, const void* block, uint16_t length_b){
uint8_t length_B;
while(length_b >= ctx->r){
keccak_nextBlock(ctx, block);
block = (uint8_t*)block + ctx->bs;
length_b -= ctx->r;
}
length_B = length_b / 8;
memxor(ctx->a, block, length_B);
/* append 1 */
if(length_b & 7){
/* we have some single bits */
uint8_t t;
t = ((uint8_t*)block)[length_B] >> (8 - (length_b & 7));
t |= 0x01 << (length_b & 7);
ctx->a[length_B] ^= t;
}else{
ctx->a[length_B] ^= 0x01;
}
if(length_B + 1 + 3 <= ctx->bs){
ctx->a[length_B + 1] ^= ctx->d;
ctx->a[length_B + 2] ^= ctx->bs;
ctx->a[length_B + 3] ^= 1;
}else{
if(length_B + 1 + 2 <= ctx->bs){
ctx->a[length_B + 1] ^= ctx->d;
ctx->a[length_B + 2] ^= ctx->bs;
keccak_f1600(ctx->a);
((uint8_t*)ctx->a)[0] ^= 0x01;
}else{
if(length_B + 1 + 1 <= ctx->bs){
ctx->a[length_B + 1] ^= ctx->d;
keccak_f1600(ctx->a);
ctx->a[0] ^= ctx->bs;
ctx->a[1] ^= 0x01;
}else{
keccak_f1600(ctx->a);
ctx->a[0] ^= ctx->d;
ctx->a[1] ^= ctx->bs;
ctx->a[2] ^= 0x01;
}
}
}
keccak_f1600(ctx->a);
}
#endif
/*
void keccak_ctx2hash(void* dest, uint16_t length_b, keccak_ctx_t* ctx){
while(length_b>=ctx->r){
memcpy(dest, ctx->a, ctx->bs);
dest = (uint8_t*)dest + ctx->bs;
length_b -= ctx->r;
keccak_f1600(ctx->a);
}
memcpy(dest, ctx->a, (length_b+7)/8);
}
*/
/*
void keccak224_ctx2hash(void* dest, keccak_ctx_t* ctx){
keccak_ctx2hash(dest, 224, ctx);
}
void keccak256_ctx2hash(void* dest, keccak_ctx_t* ctx){
keccak_ctx2hash(dest, 256, ctx);
}
void keccak384_ctx2hash(void* dest, keccak_ctx_t* ctx){
keccak_ctx2hash(dest, 384, ctx);
}
void keccak512_ctx2hash(void* dest, keccak_ctx_t* ctx){
keccak_ctx2hash(dest, 512, ctx);
}
*/
/*
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, keccak_ctx_t* ctx){
memset(ctx->a, 0x00, 5 * 5 * 8);
ctx->r = r;
ctx->bs = (uint8_t)(r / 8);
}
void keccak224_init(keccak_ctx_t* ctx){
keccak_init(1152, ctx);
}
void keccak256_init(keccak_ctx_t* ctx){
keccak_init(1088, ctx);
}
void keccak384_init(keccak_ctx_t* ctx){
keccak_init( 832, ctx);
}
void keccak512_init(keccak_ctx_t* ctx){
keccak_init( 576, ctx);
}
*/