#include <stdint.h>
#include <stdlib.h>
#include <string.h>
-#include <avr/pgmspace.h>
#include "memxor.h"
-#include "rotate64.h"
#include "keccak.h"
-#include "stdio.h"
#ifdef DEBUG
# undef DEBUG
#if DEBUG
#include "cli.h"
+#include "stdio.h"
void keccak_dump_state(uint64_t a[5][5]){
uint8_t i,j;
#endif
+void keccak_f1600(uint8_t a[200]);
-const uint8_t keccak_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,
-};
-
-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_f1600(uint64_t a[5][5]);
-
-void keccak_nextBlock(keccak_ctx_t* ctx, const void* block){
- memxor(ctx->a, block, ctx->bs);
- keccak_f1600(ctx->a);
+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 == ctx->r - 1){
+ keccak_f1600(ctx->a);
+ }
+ ctx->a[ctx->bs - 1] ^= 0x80;
+ keccak_f1600(ctx->a);
}
+#if 0
void keccak_lastBlock(keccak_ctx_t* ctx, const void* block, uint16_t length_b){
- while(length_b>=ctx->r){
+ uint8_t length_B;
+ 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 pad[3];
- memset(tmp, 0x00, ctx->bs);
- memcpy(tmp, block, (length_b+7)/8);
- /* appand 1 */
+ 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 = tmp[length_b / 8] >> (8 - (length_b & 7));
+ t = ((uint8_t*)block)[length_B] >> (8 - (length_b & 7));
t |= 0x01 << (length_b & 7);
- tmp[length_b / 8] = t;
+ ctx->a[length_B] ^= t;
}else{
- tmp[length_b / 8] = 0x01;
+ ctx->a[length_B] ^= 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 + 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 / 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;
+ 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/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;
+ 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_nextBlock(ctx, tmp);
- memset(tmp, 0x00, ctx->bs);
- tmp[0] = ctx->d;
- tmp[1] = ctx->bs;
- tmp[2] = 0x01;
+ keccak_f1600(ctx->a);
+ ctx->a[0] ^= ctx->d;
+ ctx->a[1] ^= ctx->bs;
+ ctx->a[2] ^= 0x01;
}
}
}
- keccak_nextBlock(ctx, tmp);
+ 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);
+ 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 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, 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);
ctx->r = r;
- ctx->c = c;
- ctx->d = d;
ctx->bs = (uint8_t)(r / 8);
}
void keccak224_init(keccak_ctx_t* ctx){
- keccak_init(1152, 448, 28, ctx);
+ keccak_init(1152, 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){
- keccak_init( 832, 768, 48, ctx);
+ keccak_init( 832, ctx);
}
void keccak512_init(keccak_ctx_t* ctx){
- keccak_init( 576, 1024, 64, ctx);
+ keccak_init( 576, ctx);
}
+
+*/