diff --git a/Doxyfile b/Doxyfile
index 527caaa..1166a11 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -91,8 +91,8 @@ FILE_PATTERNS = *.h \
*.H++ \
RECURSIVE \
= \
- NO
-RECURSIVE = NO
+ YES
+RECURSIVE = YES
EXCLUDE =
EXCLUDE_SYMLINKS = NO
EXCLUDE_PATTERNS = main-*
diff --git a/hfal_keccak.c b/hfal_keccak.c
new file mode 100644
index 0000000..26e6a36
--- /dev/null
+++ b/hfal_keccak.c
@@ -0,0 +1,99 @@
+/* hfal_keccak.c */
+/*
+ This file is part of the AVR-Crypto-Lib.
+ Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+/**
+ * \file hfal_keccak.c
+ * \email daniel.otte@rub.de
+ * \author Daniel Otte
+ * \date 2010-02-09
+ * \license GPLv3 or later
+ *
+ */
+
+#include
+#include
+#include "hashfunction_descriptor.h"
+#include "keccak.h"
+
+
+static const char keccak224_str[] PROGMEM = "Keccak-224";
+static const char keccak256_str[] PROGMEM = "keccak-256";
+static const char keccak384_str[] PROGMEM = "Keccak-384";
+static const char keccak512_str[] PROGMEM = "keccak-512";
+
+const hfdesc_t keccak224_desc PROGMEM = {
+ HFDESC_TYPE_HASHFUNCTION,
+ 0,
+ keccak224_str,
+ sizeof(keccak_ctx_t),
+ KECCAK224_BLOCKSIZE,
+ 224,
+ (hf_init_fpt)keccak224_init,
+ (hf_nextBlock_fpt)keccak_nextBlock,
+ (hf_lastBlock_fpt)keccak_lastBlock,
+ (hf_ctx2hash_fpt)keccak224_ctx2hash,
+ (hf_free_fpt)NULL,
+ (hf_mem_fpt)NULL
+};
+
+const hfdesc_t keccak256_desc PROGMEM = {
+ HFDESC_TYPE_HASHFUNCTION,
+ 0,
+ keccak256_str,
+ sizeof(keccak_ctx_t),
+ KECCAK256_BLOCKSIZE,
+ 256,
+ (hf_init_fpt)keccak256_init,
+ (hf_nextBlock_fpt)keccak_nextBlock,
+ (hf_lastBlock_fpt)keccak_lastBlock,
+ (hf_ctx2hash_fpt)keccak256_ctx2hash,
+ (hf_free_fpt)NULL,
+ (hf_mem_fpt)NULL
+};
+
+const hfdesc_t keccak384_desc PROGMEM = {
+ HFDESC_TYPE_HASHFUNCTION,
+ 0,
+ keccak384_str,
+ sizeof(keccak_ctx_t),
+ KECCAK384_BLOCKSIZE,
+ 384,
+ (hf_init_fpt)keccak384_init,
+ (hf_nextBlock_fpt)keccak_nextBlock,
+ (hf_lastBlock_fpt)keccak_lastBlock,
+ (hf_ctx2hash_fpt)keccak384_ctx2hash,
+ (hf_free_fpt)NULL,
+ (hf_mem_fpt)NULL
+};
+
+const hfdesc_t keccak512_desc PROGMEM = {
+ HFDESC_TYPE_HASHFUNCTION,
+ 0,
+ keccak512_str,
+ sizeof(keccak_ctx_t),
+ KECCAK512_BLOCKSIZE,
+ 512,
+ (hf_init_fpt)keccak512_init,
+ (hf_nextBlock_fpt)keccak_nextBlock,
+ (hf_lastBlock_fpt)keccak_lastBlock,
+ (hf_ctx2hash_fpt)keccak512_ctx2hash,
+ (hf_free_fpt)NULL,
+ (hf_mem_fpt)NULL
+};
+
+
diff --git a/hfal_keccak.h b/hfal_keccak.h
new file mode 100644
index 0000000..662c6e3
--- /dev/null
+++ b/hfal_keccak.h
@@ -0,0 +1,39 @@
+/* hfal_keccak.h */
+/*
+ This file is part of the AVR-Crypto-Lib.
+ Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+/**
+ * \file hfal_keccak.h
+ * \email daniel.otte@rub.de
+ * \author Daniel Otte
+ * \date 2010-02-09
+ * \license GPLv3 or later
+ *
+ */
+
+#ifndef HFAL_KECCAK_H_
+#define HFAL_KECCAK_H_
+
+#include
+#include "hashfunction_descriptor.h"
+
+extern const hfdesc_t keccak224_desc;
+extern const hfdesc_t keccak256_desc;
+extern const hfdesc_t keccak384_desc;
+extern const hfdesc_t keccak512_desc;
+
+#endif /* HFAL_KECCAK_H_ */
diff --git a/keccak/keccak.c b/keccak/keccak.c
new file mode 100644
index 0000000..59c357e
--- /dev/null
+++ b/keccak/keccak.c
@@ -0,0 +1,266 @@
+/* keecak.c */
+/*
+ This file is part of the AVR-Crypto-Lib.
+ Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+
+#include
+#include
+#include
+#include
+#include "memxor.h"
+#include "keccak.h"
+
+#define W 64
+
+#ifdef DEBUG
+# undef DEBUG
+#endif
+
+#define DEBUG 1
+
+
+#if DEBUG
+#include "cli.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
+
+#undef DEBUG
+
+static uint64_t rc[] PROGMEM = {
+ 0x0000000000000001LL, 0x0000000000008082LL,
+ 0x800000000000808ALL, 0x8000000080008000LL,
+ 0x000000000000808BLL, 0x0000000080000001LL,
+ 0x8000000080008081LL, 0x8000000000008009LL,
+ 0x000000000000008ALL, 0x0000000000000088LL,
+ 0x0000000080008009LL, 0x000000008000000ALL,
+ 0x000000008000808BLL, 0x800000000000008BLL,
+ 0x8000000000008089LL, 0x8000000000008003LL,
+ 0x8000000000008002LL, 0x8000000000000080LL,
+ 0x000000000000800ALL, 0x800000008000000ALL,
+ 0x8000000080008081LL, 0x8000000000008080LL,
+ 0x0000000080000001LL, 0x8000000080008008LL
+};
+
+uint64_t rotl64(uint64_t a, uint8_t r){
+ return (a<>(64-r));
+}
+
+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 }
+};
+
+void keccak_round(uint64_t a[5][5], uint8_t rci){
+ uint64_t c[5], d[5], 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];
+ }
+ for(i=0; i<5; ++i){
+ d[i] = c[(4+i)%5] ^ rotl64(c[(i+1)%5], 1);
+ }
+ for(i=0; i<5; ++i){
+ for(j=0; j<5; ++j){
+ a[j][i] ^= d[i];
+ }
+ }
+#if DEBUG
+ cli_putstr_P(PSTR("\r\nAfter theta:"));
+ 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])));
+ }
+ }
+#if DEBUG
+ cli_putstr_P(PSTR("\r\n--- after rho & pi ---"));
+ 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]));
+ }
+ }
+#if DEBUG
+ cli_putstr_P(PSTR("\r\nAfter chi:"));
+ keccak_dump_state(a);
+#endif
+ /* iota */
+ uint64_t t;
+ memcpy_P(&t, &(rc[rci]), 8);
+ a[0][0] ^= t;
+#if DEBUG
+ cli_putstr_P(PSTR("\r\nAfter iota:"));
+ keccak_dump_state(a);
+#endif
+}
+
+void keccak_f1600(uint64_t a[5][5]){
+ 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);
+}
+
+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){
+ 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 */
+ 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;
+ }else{
+ tmp[length_b/8] = 0x01;
+ }
+ pad[0] = ctx->d;
+ pad[1] = ctx->bs;
+ pad[2] = 0x01;
+ if(length_b/8+1+3bs){
+ memcpy(tmp+length_b/8+1, pad, 3);
+ }else{
+ if(length_b/8+1+2bs){
+ 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+1bs){
+ 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);
+ keccak_dump_ctx(ctx);
+}
+
+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, uint16_t c, uint8_t d, 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);
+}
+
+void keccak256_init(keccak_ctx_t* ctx){
+ keccak_init(1088, 512, 32, ctx);
+}
+
+void keccak384_init(keccak_ctx_t* ctx){
+ keccak_init( 832, 768, 48, ctx);
+}
+
+void keccak512_init(keccak_ctx_t* ctx){
+ keccak_init( 576, 1024, 64, ctx);
+}
diff --git a/keccak/keccak.h b/keccak/keccak.h
new file mode 100644
index 0000000..6d31e71
--- /dev/null
+++ b/keccak/keccak.h
@@ -0,0 +1,58 @@
+/* keccak.h */
+/*
+ This file is part of the AVR-Crypto-Lib.
+ Copyright (C) 2010 Daniel Otte (daniel.otte@rub.de)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+
+#ifndef KECCAK_H_
+#define KECCAK_H_
+
+#include
+
+#define KECCAK224_BLOCKSIZE 1152
+#define KECCAK224_BLOCKSIZE_B (KECCAK224_BLOCKSIZE/8)
+#define KECCAK256_BLOCKSIZE 1088
+#define KECCAK256_BLOCKSIZE_B (KECCAK256_BLOCKSIZE/8)
+#define KECCAK384_BLOCKSIZE 832
+#define KECCAK384_BLOCKSIZE_B (KECCAK384_BLOCKSIZE/8)
+#define KECCAK512_BLOCKSIZE 576
+#define KECCAK512_BLOCKSIZE_B (KECCAK512_BLOCKSIZE/8)
+
+typedef struct{
+ uint64_t a[5][5];
+ uint16_t r, c;
+ uint8_t d, bs;
+} 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);
+void keccak384_init(keccak_ctx_t* ctx);
+void keccak512_init(keccak_ctx_t* ctx);
+
+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_ctx2hash(void* dest, uint16_t length_b, keccak_ctx_t* ctx);
+void keccak224_ctx2hash(void* dest, keccak_ctx_t* ctx);
+void keccak256_ctx2hash(void* dest, keccak_ctx_t* ctx);
+void keccak384_ctx2hash(void* dest, keccak_ctx_t* ctx);
+void keccak512_ctx2hash(void* dest, keccak_ctx_t* ctx);
+
+#endif /* KECCAK_H_ */
diff --git a/keccak/memxor.S b/keccak/memxor.S
new file mode 100644
index 0000000..a32058b
--- /dev/null
+++ b/keccak/memxor.S
@@ -0,0 +1,66 @@
+/* memxor.S */
+/*
+ This file is part of the AVR-Crypto-Lib.
+ Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+
+/*
+ * File: memxor.S
+ * Author: Daniel Otte
+ * Date: 2008-08-07
+ * License: GPLv3 or later
+ * Description: memxor, XORing one block into another
+ *
+ */
+
+/*
+ * void memxor(void* dest, const void* src, uint16_t n);
+ */
+ /*
+ * param dest is passed in r24:r25
+ * param src is passed in r22:r23
+ * param n is passed in r20:r21
+ */
+.global memxor
+memxor:
+ movw r30, r24
+ movw r26, r22
+ movw r24, r20
+ adiw r24, 0
+ breq 2f
+1:
+ ld r20, X+
+ ld r21, Z
+ eor r20, r21
+ st Z+, r20
+ sbiw r24, 1
+ brne 1b
+2:
+ ret
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/keccak/memxor.h b/keccak/memxor.h
new file mode 100644
index 0000000..a62a616
--- /dev/null
+++ b/keccak/memxor.h
@@ -0,0 +1,7 @@
+#ifndef MEMXOR_H_
+#define MEMXOR_H_
+#include
+
+void memxor(void* dest, const void* src, uint16_t n);
+
+#endif
diff --git a/mkfiles/keccak_c.mk b/mkfiles/keccak_c.mk
new file mode 100644
index 0000000..b5f8241
--- /dev/null
+++ b/mkfiles/keccak_c.mk
@@ -0,0 +1,12 @@
+# Makefile for BlueMidnightWish
+ALGO_NAME := KECCAK_C
+
+# comment out the following line for removement of BlueMidnightWish from the build process
+HASHES += $(ALGO_NAME)
+
+$(ALGO_NAME)_DIR := keccak/
+$(ALGO_NAME)_OBJ := keccak.o memxor.o
+$(ALGO_NAME)_TEST_BIN := main-keccak-test.o hfal_keccak.o $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_NESSIE_TEST := test nessie
+$(ALGO_NAME)_PERFORMANCE_TEST := performance
+
diff --git a/test_src/main-aes-test.c b/test_src/main-aes-test.c
index f075250..b17382a 100644
--- a/test_src/main-aes-test.c
+++ b/test_src/main-aes-test.c
@@ -527,157 +527,145 @@ void testrun_aes192_cmac0(void){
cli_hexdump_block(tag, 2, 4, 16);
bcal_cmac_free(&ctx);
}
-/*
-MSG:
-KEY: 233952DEE4D5ED5F9B9C6D6FF80FF478
-NONCE: 62EC67F9C3A4A407FCB2A8C49031A8B3
-HEADER: 6BFB914FD07EAE6B
-CIPHER: E037830E8389F27B025A2D6527E79D01
-*/
+
+uint8_t eax_msg[] PROGMEM = {
+ 0xF7, 0xFB,
+ 0x1A, 0x47, 0xCB, 0x49, 0x33,
+ 0x48, 0x1C, 0x9E, 0x39, 0xB1,
+ 0x40, 0xD0, 0xC0, 0x7D, 0xA5, 0xE4,
+ 0x4D, 0xE3, 0xB3, 0x5C, 0x3F, 0xC0, 0x39, 0x24, 0x5B, 0xD1, 0xFB, 0x7D,
+ 0x8B, 0x0A, 0x79, 0x30, 0x6C, 0x9C, 0xE7, 0xED, 0x99, 0xDA, 0xE4, 0xF8, 0x7F, 0x8D, 0xD6, 0x16, 0x36,
+ 0x1B, 0xDA, 0x12, 0x2B, 0xCE, 0x8A, 0x8D, 0xBA, 0xF1, 0x87, 0x7D, 0x96, 0x2B, 0x85, 0x92, 0xDD, 0x2D, 0x56,
+ 0x6C, 0xF3, 0x67, 0x20, 0x87, 0x2B, 0x85, 0x13, 0xF6, 0xEA, 0xB1, 0xA8, 0xA4, 0x44, 0x38, 0xD5, 0xEF, 0x11,
+ 0xCA, 0x40, 0xD7, 0x44, 0x6E, 0x54, 0x5F, 0xFA, 0xED, 0x3B, 0xD1, 0x2A, 0x74, 0x0A, 0x65, 0x9F, 0xFB, 0xBB, 0x3C, 0xEA, 0xB7
+};
+
+uint8_t eax_msg_len[] PROGMEM = {0, 2, 5, 5, 6, 12, 17, 18, 18, 21};
+
+uint8_t eax_key[] PROGMEM = {
+ 0x23, 0x39, 0x52, 0xDE, 0xE4, 0xD5, 0xED, 0x5F, 0x9B, 0x9C, 0x6D, 0x6F, 0xF8, 0x0F, 0xF4, 0x78,
+ 0x91, 0x94, 0x5D, 0x3F, 0x4D, 0xCB, 0xEE, 0x0B, 0xF4, 0x5E, 0xF5, 0x22, 0x55, 0xF0, 0x95, 0xA4,
+ 0x01, 0xF7, 0x4A, 0xD6, 0x40, 0x77, 0xF2, 0xE7, 0x04, 0xC0, 0xF6, 0x0A, 0xDA, 0x3D, 0xD5, 0x23,
+ 0xD0, 0x7C, 0xF6, 0xCB, 0xB7, 0xF3, 0x13, 0xBD, 0xDE, 0x66, 0xB7, 0x27, 0xAF, 0xD3, 0xC5, 0xE8,
+ 0x35, 0xB6, 0xD0, 0x58, 0x00, 0x05, 0xBB, 0xC1, 0x2B, 0x05, 0x87, 0x12, 0x45, 0x57, 0xD2, 0xC2,
+ 0xBD, 0x8E, 0x6E, 0x11, 0x47, 0x5E, 0x60, 0xB2, 0x68, 0x78, 0x4C, 0x38, 0xC6, 0x2F, 0xEB, 0x22,
+ 0x7C, 0x77, 0xD6, 0xE8, 0x13, 0xBE, 0xD5, 0xAC, 0x98, 0xBA, 0xA4, 0x17, 0x47, 0x7A, 0x2E, 0x7D,
+ 0x5F, 0xFF, 0x20, 0xCA, 0xFA, 0xB1, 0x19, 0xCA, 0x2F, 0xC7, 0x35, 0x49, 0xE2, 0x0F, 0x5B, 0x0D,
+ 0xA4, 0xA4, 0x78, 0x2B, 0xCF, 0xFD, 0x3E, 0xC5, 0xE7, 0xEF, 0x6D, 0x8C, 0x34, 0xA5, 0x61, 0x23,
+ 0x83, 0x95, 0xFC, 0xF1, 0xE9, 0x5B, 0xEB, 0xD6, 0x97, 0xBD, 0x01, 0x0B, 0xC7, 0x66, 0xAA, 0xC3
+};
+
+uint8_t eax_nonce[] PROGMEM = {
+ 0x62, 0xEC, 0x67, 0xF9, 0xC3, 0xA4, 0xA4, 0x07, 0xFC, 0xB2, 0xA8, 0xC4, 0x90, 0x31, 0xA8, 0xB3,
+ 0xBE, 0xCA, 0xF0, 0x43, 0xB0, 0xA2, 0x3D, 0x84, 0x31, 0x94, 0xBA, 0x97, 0x2C, 0x66, 0xDE, 0xBD,
+ 0x70, 0xC3, 0xDB, 0x4F, 0x0D, 0x26, 0x36, 0x84, 0x00, 0xA1, 0x0E, 0xD0, 0x5D, 0x2B, 0xFF, 0x5E,
+ 0x84, 0x08, 0xDF, 0xFF, 0x3C, 0x1A, 0x2B, 0x12, 0x92, 0xDC, 0x19, 0x9E, 0x46, 0xB7, 0xD6, 0x17,
+ 0xFD, 0xB6, 0xB0, 0x66, 0x76, 0xEE, 0xDC, 0x5C, 0x61, 0xD7, 0x42, 0x76, 0xE1, 0xF8, 0xE8, 0x16,
+ 0x6E, 0xAC, 0x5C, 0x93, 0x07, 0x2D, 0x8E, 0x85, 0x13, 0xF7, 0x50, 0x93, 0x5E, 0x46, 0xDA, 0x1B,
+ 0x1A, 0x8C, 0x98, 0xDC, 0xD7, 0x3D, 0x38, 0x39, 0x3B, 0x2B, 0xF1, 0x56, 0x9D, 0xEE, 0xFC, 0x19,
+ 0xDD, 0xE5, 0x9B, 0x97, 0xD7, 0x22, 0x15, 0x6D, 0x4D, 0x9A, 0xFF, 0x2B, 0xC7, 0x55, 0x98, 0x26,
+ 0xB7, 0x81, 0xFC, 0xF2, 0xF7, 0x5F, 0xA5, 0xA8, 0xDE, 0x97, 0xA9, 0xCA, 0x48, 0xE5, 0x22, 0xEC,
+ 0x22, 0xE7, 0xAD, 0xD9, 0x3C, 0xFC, 0x63, 0x93, 0xC5, 0x7E, 0xC0, 0xB3, 0xC1, 0x7D, 0x6B, 0x44
+};
+
+uint8_t eax_header[] PROGMEM = {
+ 0x6B, 0xFB, 0x91, 0x4F, 0xD0, 0x7E, 0xAE, 0x6B,
+ 0xFA, 0x3B, 0xFD, 0x48, 0x06, 0xEB, 0x53, 0xFA,
+ 0x23, 0x4A, 0x34, 0x63, 0xC1, 0x26, 0x4A, 0xC6,
+ 0x33, 0xCC, 0xE2, 0xEA, 0xBF, 0xF5, 0xA7, 0x9D,
+ 0xAE, 0xB9, 0x6E, 0xAE, 0xBE, 0x29, 0x70, 0xE9,
+ 0xD4, 0x48, 0x2D, 0x1C, 0xA7, 0x8D, 0xCE, 0x0F,
+ 0x65, 0xD2, 0x01, 0x79, 0x90, 0xD6, 0x25, 0x28,
+ 0x54, 0xB9, 0xF0, 0x4E, 0x6A, 0x09, 0x18, 0x9A,
+ 0x89, 0x9A, 0x17, 0x58, 0x97, 0x56, 0x1D, 0x7E,
+ 0x12, 0x67, 0x35, 0xFC, 0xC3, 0x20, 0xD2, 0x5A
+};
+
+uint8_t eax_cipher[] PROGMEM = {
+ 0xE0, 0x37, 0x83, 0x0E, 0x83, 0x89, 0xF2, 0x7B, 0x02, 0x5A, 0x2D, 0x65, 0x27, 0xE7, 0x9D, 0x01,
+ 0x19, 0xDD, 0x5C, 0x4C, 0x93, 0x31, 0x04, 0x9D, 0x0B, 0xDA, 0xB0, 0x27, 0x74, 0x08, 0xF6, 0x79, 0x67, 0xE5,
+ 0xD8, 0x51, 0xD5, 0xBA, 0xE0, 0x3A, 0x59, 0xF2, 0x38, 0xA2, 0x3E, 0x39, 0x19, 0x9D, 0xC9, 0x26, 0x66, 0x26, 0xC4, 0x0F, 0x80,
+ 0x63, 0x2A, 0x9D, 0x13, 0x1A, 0xD4, 0xC1, 0x68, 0xA4, 0x22, 0x5D, 0x8E, 0x1F, 0xF7, 0x55, 0x93, 0x99, 0x74, 0xA7, 0xBE, 0xDE,
+ 0x07, 0x1D, 0xFE, 0x16, 0xC6, 0x75, 0xCB, 0x06, 0x77, 0xE5, 0x36, 0xF7, 0x3A, 0xFE, 0x6A, 0x14, 0xB7, 0x4E, 0xE4, 0x98, 0x44, 0xDD,
+ 0x83, 0x5B, 0xB4, 0xF1, 0x5D, 0x74, 0x3E, 0x35, 0x0E, 0x72, 0x84, 0x14, 0xAB, 0xB8, 0x64, 0x4F, 0xD6, 0xCC, 0xB8, 0x69, 0x47, 0xC5, 0xE1, 0x05, 0x90, 0x21, 0x0A, 0x4F,
+ 0x02, 0x08, 0x3E, 0x39, 0x79, 0xDA, 0x01, 0x48, 0x12, 0xF5, 0x9F, 0x11, 0xD5, 0x26, 0x30, 0xDA, 0x30, 0x13, 0x73, 0x27, 0xD1, 0x06, 0x49, 0xB0, 0xAA, 0x6E, 0x1C, 0x18, 0x1D, 0xB6, 0x17, 0xD7, 0xF2,
+ 0x2E, 0xC4, 0x7B, 0x2C, 0x49, 0x54, 0xA4, 0x89, 0xAF, 0xC7, 0xBA, 0x48, 0x97, 0xED, 0xCD, 0xAE, 0x8C, 0xC3, 0x3B, 0x60, 0x45, 0x05, 0x99, 0xBD, 0x02, 0xC9, 0x63, 0x82, 0x90, 0x2A, 0xEF, 0x7F, 0x83, 0x2A,
+ 0x0D, 0xE1, 0x8F, 0xD0, 0xFD, 0xD9, 0x1E, 0x7A, 0xF1, 0x9F, 0x1D, 0x8E, 0xE8, 0x73, 0x39, 0x38, 0xB1, 0xE8, 0xE7, 0xF6, 0xD2, 0x23, 0x16, 0x18, 0x10, 0x2F, 0xDB, 0x7F, 0xE5, 0x5F, 0xF1, 0x99, 0x17, 0x00,
+ 0xCB, 0x89, 0x20, 0xF8, 0x7A, 0x6C, 0x75, 0xCF, 0xF3, 0x96, 0x27, 0xB5, 0x6E, 0x3E, 0xD1, 0x97, 0xC5, 0x52, 0xD2, 0x95, 0xA7, 0xCF, 0xC4, 0x6A, 0xFC, 0x25, 0x3B, 0x46, 0x52, 0xB1, 0xAF, 0x37, 0x95, 0xB1, 0x24, 0xAB, 0x6E
+};
void testrun_aes128_eax(void){
- uint8_t key[16]= {
- 0x23, 0x39, 0x52, 0xDE, 0xE4, 0xD5, 0xED, 0x5F,
- 0x9B, 0x9C, 0x6D, 0x6F, 0xF8, 0x0F, 0xF4, 0x78
- };
- uint8_t nonce[16] = {
- 0x62, 0xEC, 0x67, 0xF9, 0xC3, 0xA4, 0xA4, 0x07,
- 0xFC, 0xB2, 0xA8, 0xC4, 0x90, 0x31, 0xA8, 0xB3
- };
- uint8_t header[8] = {
- 0x6B, 0xFB, 0x91, 0x4F, 0xD0, 0x7E, 0xAE, 0x6B
- };
+ uint8_t key[16];
+ uint8_t nonce[16];
+ uint8_t header[8];
uint8_t tag[16];
+ uint8_t msg[21];
+ uint8_t msg_len;
+ PGM_VOID_P msg_p;
+ PGM_VOID_P cipher_p;
+ uint8_t i, r;
bcal_eax_ctx_t ctx;
- uint8_t r;
+ msg_p = eax_msg;
+ cipher_p = eax_cipher;
+ for(i=0; i<10; ++i){
+ cli_putstr_P(PSTR("\r\n\r\n** AES128-EAX-TEST #"));
+ cli_putc('0'+i);
+ cli_putstr_P(PSTR(" **"));
- cli_putstr_P(PSTR("\r\n** AES128-EAX-TEST **"));
+ msg_len = pgm_read_byte(eax_msg_len+i);
+ memcpy_P(key, eax_key+16*i, 16);
+ memcpy_P(nonce, eax_nonce+16*i, 16);
+ memcpy_P(header, eax_header+8*i, 8);
+ memcpy_P(msg, msg_p, msg_len);
+ msg_p = (uint8_t*)msg_p+msg_len;
- cli_putstr_P(PSTR("\r\n key: "));
- cli_hexdump(key, 16);
- cli_putstr_P(PSTR("\r\n nonce: "));
- cli_hexdump(nonce, 16);
- cli_putstr_P(PSTR("\r\n header: "));
- cli_hexdump(header, 8);
- r = bcal_eax_init(&aes128_desc, key, 128, &ctx);
- cli_putstr_P(PSTR("\r\n init = 0x"));
- cli_hexdump(&r, 1);
- if(r)
- return;
- bcal_eax_loadNonce(nonce, 16*8, &ctx);
- bcal_eax_addLastHeader(header, 8*8, &ctx);
- bcal_eax_encLastBlock(NULL, 0, &ctx);
- bcal_eax_ctx2tag(tag, 128, &ctx);
- cli_putstr_P(PSTR("\r\n tag: "));
- cli_hexdump_block(tag, 16, 4, 16);
- bcal_eax_free(&ctx);
-}
+ cli_putstr_P(PSTR("\r\n key: "));
+ cli_hexdump(key, 16);
+ cli_putstr_P(PSTR("\r\n msg: "));
+ if(msg_len){
+ cli_hexdump(msg, msg_len);
+ }
+ cli_putstr_P(PSTR("\r\n nonce: "));
+ cli_hexdump(nonce, 16);
+ cli_putstr_P(PSTR("\r\n header: "));
+ cli_hexdump(header, 8);
-/*
-MSG: F7FB
-KEY: 91945D3F4DCBEE0BF45EF52255F095A4
-NONCE: BECAF043B0A23D843194BA972C66DEBD
-HEADER: FA3BFD4806EB53FA
-CIPHER:
- */
-void testrun_aes128_eax2(void){
- uint8_t key[16]= {
- 0x91, 0x94, 0x5D, 0x3F, 0x4D, 0xCB, 0xEE, 0x0B,
- 0xF4, 0x5E, 0xF5, 0x22, 0x55, 0xF0, 0x95, 0xA4,
- };
- uint8_t msg[2] = { 0xF7, 0xFB };
- uint8_t nonce[16] = {
- 0xBE, 0xCA, 0xF0, 0x43, 0xB0, 0xA2, 0x3D, 0x84,
- 0x31, 0x94, 0xBA, 0x97, 0x2C, 0x66, 0xDE, 0xBD,
- };
- uint8_t header[8] = {
- 0xFA, 0x3B, 0xFD, 0x48, 0x06, 0xEB, 0x53, 0xFA
- };
- uint8_t tag[16];
+ r = bcal_eax_init(&aes128_desc, key, 128, &ctx);
+ cli_putstr_P(PSTR("\r\n init = 0x"));
+ cli_hexdump(&r, 1);
+ if(r)
+ return;
+ bcal_eax_loadNonce(nonce, 16*8, &ctx);
+ bcal_eax_addLastHeader(header, 8*8, &ctx);
+ bcal_eax_encLastBlock(msg, msg_len*8, &ctx);
+ bcal_eax_ctx2tag(tag, 128, &ctx);
- bcal_eax_ctx_t ctx;
- uint8_t r;
+ cli_putstr_P(PSTR("\r\n cipher: "));
+ cli_hexdump_block(msg, msg_len, 4, 16);
+ cli_putstr_P(PSTR("\r\n tag: "));
+ cli_hexdump_block(tag, 16, 4, 16);
- cli_putstr_P(PSTR("\r\n** AES128-EAX2-TEST **"));
+ if(memcmp_P(msg, cipher_p, msg_len)){
+ cli_putstr_P(PSTR("\r\n cipher: [fail]\r\n should: "));
+ memcpy_P(msg, cipher_p, msg_len);
+ cli_hexdump_block(msg, msg_len, 4, 16);
+ }else{
+ cli_putstr_P(PSTR("\r\n cipher: [pass]"));
+ }
+ cipher_p = ((uint8_t*)cipher_p)+msg_len;
+ // *
+ if(memcmp_P(tag, cipher_p, 16)){
+ cli_putstr_P(PSTR("\r\n tag: [fail]"));
+ }else{
+ cli_putstr_P(PSTR("\r\n tag: [pass]"));
+ }
- cli_putstr_P(PSTR("\r\n key: "));
- cli_hexdump(key, 16);
- cli_putstr_P(PSTR("\r\n msg: "));
- cli_hexdump(msg, 2);
- cli_putstr_P(PSTR("\r\n nonce: "));
- cli_hexdump(nonce, 16);
- cli_putstr_P(PSTR("\r\n header: "));
- cli_hexdump(header, 8);
- r = bcal_eax_init(&aes128_desc, key, 128, &ctx);
- cli_putstr_P(PSTR("\r\n init = 0x"));
- cli_hexdump(&r, 1);
- if(r)
- return;
- bcal_eax_loadNonce(nonce, 16*8, &ctx);
- bcal_eax_addLastHeader(header, 8*8, &ctx);
- bcal_eax_encLastBlock(msg, 2*8, &ctx);
- bcal_eax_ctx2tag(tag, 128, &ctx);
- cli_putstr_P(PSTR("\r\n cipher: "));
- cli_hexdump_block(msg, 2, 4, 16);
- cli_putstr_P(PSTR("\r\n tag: "));
- cli_hexdump_block(tag, 16, 4, 16);
- bcal_eax_free(&ctx);
-}
-/*
-MSG: 1A47CB4933
-KEY: 01F74AD64077F2E704C0F60ADA3DD523
-NONCE: 70C3DB4F0D26368400A10ED05D2BFF5E
-HEADER: 234A3463C1264AC6
-CIPHER:
-*/
-void testrun_aes128_eax3(void){
- uint8_t key[16]= {
- 0x01, 0xF7, 0x4A, 0xD6, 0x40, 0x77, 0xF2, 0xE7,
- 0x04, 0xC0, 0xF6, 0x0A, 0xDA, 0x3D, 0xD5, 0x23
- };
- uint8_t msg[5] = {
- 0x1A, 0x47, 0xCB, 0x49, 0x33
- };
- uint8_t nonce[16] = {
- 0x70, 0xC3, 0xDB, 0x4F, 0x0D, 0x26, 0x36, 0x84,
- 0x00, 0xA1, 0x0E, 0xD0, 0x5D, 0x2B, 0xFF, 0x5E
- };
- uint8_t header[8] = {
- 0x23, 0x4A, 0x34, 0x63, 0xC1, 0x26, 0x4A, 0xC6
- };
- uint8_t tag[16];
-
- bcal_eax_ctx_t ctx;
- uint8_t r;
-
-
- cli_putstr_P(PSTR("\r\n** AES128-EAX3-TEST **"));
-
- cli_putstr_P(PSTR("\r\n key: "));
- cli_hexdump(key, 16);
- cli_putstr_P(PSTR("\r\n msg: "));
- cli_hexdump(msg, 5);
- cli_putstr_P(PSTR("\r\n nonce: "));
- cli_hexdump(nonce, 16);
- cli_putstr_P(PSTR("\r\n header: "));
- cli_hexdump(header, 8);
- r = bcal_eax_init(&aes128_desc, key, 128, &ctx);
- cli_putstr_P(PSTR("\r\n init = 0x"));
- cli_hexdump(&r, 1);
- if(r)
- return;
- bcal_eax_loadNonce(nonce, 16*8, &ctx);
- bcal_eax_addLastHeader(header, 8*8, &ctx);
- bcal_eax_encLastBlock(msg, 5*8, &ctx);
- bcal_eax_ctx2tag(tag, 128, &ctx);
- cli_putstr_P(PSTR("\r\n cipher: "));
- cli_hexdump_block(msg, 5, 4, 16);
- cli_putstr_P(PSTR("\r\n tag: "));
- cli_hexdump_block(tag, 16, 4, 16);
- bcal_eax_free(&ctx);
+ cipher_p = ((uint8_t*)cipher_p)+16;
+ bcal_eax_free(&ctx);
+ }
}
/*****************************************************************************/
@@ -823,8 +811,6 @@ const char testcmac_str[] PROGMEM = "testcmac";
const char testcmac72_str[] PROGMEM = "testcmac72";
const char testcmac0_str[] PROGMEM = "testcmac0";
const char testeax_str[] PROGMEM = "testeax";
-const char testeax2_str[] PROGMEM = "testeax2";
-const char testeax3_str[] PROGMEM = "testeax3";
const char cmacvs_list_str[] PROGMEM = "cmacvs_list";
const char cmacvs_set_str[] PROGMEM = "cmacvs_set";
const char cmacvs_test1_str[] PROGMEM = "cmacvs_test1";
@@ -846,8 +832,6 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
{ testcmac72_str, NULL, testrun_aes128_cmac72 },
{ testcmac0_str, NULL, testrun_aes192_cmac0 },
{ testeax_str, NULL, testrun_aes128_eax },
- { testeax2_str, NULL, testrun_aes128_eax2 },
- { testeax3_str, NULL, testrun_aes128_eax3 },
{ cmacvs_list_str, NULL, cmacvs_listalgos },
{ cmacvs_set_str, (void*)1, (void_fpt)cmacvs_setalgo },
{ cmacvs_test1_str, NULL, cmacvs_test1 },
diff --git a/test_src/main-keccak-test.c b/test_src/main-keccak-test.c
new file mode 100644
index 0000000..42aeb4a
--- /dev/null
+++ b/test_src/main-keccak-test.c
@@ -0,0 +1,120 @@
+/* main-keccak-test.c */
+/*
+ This file is part of the AVR-Crypto-Lib.
+ Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de)
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+*/
+/*
+ * Keccak test-suit
+ *
+*/
+
+#include "config.h"
+#include "uart_i.h"
+#include "debug.h"
+
+#include "keccak.h"
+#include "cli.h"
+#include "hfal_keccak.h"
+#include "shavs.h"
+#include "nessie_hash_test.h"
+#include "performance_test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
+
+#include
+#include
+#include