diff --git a/keccak/keccak-asm.S b/keccak/keccak-asm.S
new file mode 100644
index 0000000..6887a75
--- /dev/null
+++ b/keccak/keccak-asm.S
@@ -0,0 +1,78 @@
+/* keccac-asm.S */
+/*
+ This file is part of the AVR-Crypto-Lib.
+ Copyright (C) 2012 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 keccak-asm.S
+ * \email daniel.otte@rub.de
+ * \author Daniel Otte
+ * \date 2012-12-16
+ * \license GPLv3 or later
+ *
+ */
+
+.nolist
+#include "avr-asm-macros.S"
+.list
+/*
+ void keccak_theta (uint64_t *a, uint64_t *b){
+ // uint64_t b[5][5];
+ for(i = 0; i < 5; ++i){
+ b[i][0] = a[0][i] ^ a[1][i] ^ a[2][i] ^ a[3][i] ^ a[4][i];
+ }
+ }
+*/
+
+.global keccak_theta
+keccak_theta:
+ movw r30, r24
+ movw r26, r22
+
+; .irp offset, 0, 1, 2, 3, 4
+
+ ldi r19, 5
+10:
+ ldi r20, 8
+20:
+
+ ld r22, Z
+ adiw ZL, 40
+ ld r21, Z
+ eor r22, r21
+ adiw ZL, 40
+ ld r21, Z
+ eor r22, r21
+ adiw ZL, 40
+ ld r21, Z
+ eor r22, r21
+ adiw ZL, 40
+ ld r21, Z
+ eor r22, r21
+
+ adiw r24, 1
+ movw r30, r24
+
+ st X+, r22
+ dec r20
+ brne 20b
+
+ adiw XL, 8 * 4
+ dec r19
+ brne 10b
+; .endr
+
+ ret
diff --git a/keccak/keccak-stub.c b/keccak/keccak-stub.c
new file mode 100644
index 0000000..5b9e3c4
--- /dev/null
+++ b/keccak/keccak-stub.c
@@ -0,0 +1,293 @@
+/* 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 "rotate64.h"
+#include "keccak.h"
+#include "stdio.h"
+
+#ifdef DEBUG
+# undef DEBUG
+#endif
+
+#define DEBUG 0
+
+#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
+
+/*
+const 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
+};
+*/
+
+const static uint8_t 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 static uint8_t r[5][5] PROGMEM = {
+ { ROT_CODE( 0), ROT_CODE(36), ROT_CODE( 3), ROT_CODE(41), ROT_CODE(18) },
+ { ROT_CODE( 1), ROT_CODE(44), ROT_CODE(10), ROT_CODE(45), ROT_CODE( 2) },
+ { ROT_CODE(62), ROT_CODE( 6), ROT_CODE(43), ROT_CODE(15), ROT_CODE(61) },
+ { ROT_CODE(28), ROT_CODE(55), ROT_CODE(25), ROT_CODE(21), ROT_CODE(56) },
+ { ROT_CODE(27), ROT_CODE(20), ROT_CODE(39), ROT_CODE( 8), ROT_CODE(14) }
+};
+
+void keccak_theta(uint64_t *a, uint64_t *b);
+
+static inline
+void keccak_round(uint64_t a[5][5], uint8_t rci){
+ uint64_t b[5][5];
+ uint8_t i, j;
+ union {
+ uint64_t v64;
+ uint8_t v8[8];
+ } t;
+ /* theta */
+#if DEBUG
+ printf_P(PSTR("\npre-theta(1):"));
+ keccak_dump_state(b);
+#endif
+ keccak_theta((uint64_t*)a, (uint64_t*)b);
+#if DEBUG
+ printf_P(PSTR("\npost-theta(1):"));
+ keccak_dump_state(b);
+#endif
+ for(i = 0; i < 5; ++i){
+ t.v64 = b[(4 + i) % 5][0] ^ rotate64_1bit_left(b[(i + 1) % 5][0]);
+ for(j = 0; j < 5; ++j){
+ a[j][i] ^= t.v64;
+ }
+ }
+#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] = rotate64left_code(a[j][i], pgm_read_byte(&(r[i][j])));
+ }
+ }
+#if DEBUG & 0
+ 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 & 0
+ cli_putstr_P(PSTR("\r\nAfter chi:"));
+ keccak_dump_state(a);
+#endif
+ /* iota */
+
+// memcpy_P(&t, &(rc_comp[rci]), 8);
+ t.v64 = 0;
+ t.v8[0] = pgm_read_byte(&(rc_comp[rci]));
+ if(t.v8[0] & 0x40){
+ t.v8[7] = 0x80;
+ }
+ if(t.v8[0] & 0x20){
+ t.v8[3] = 0x80;
+ }
+ if(t.v8[0] & 0x10){
+ t.v8[1] = 0x80;
+ }
+ t.v8[0] &= 0x8F;
+
+ a[0][0] ^= t.v64;
+#if DEBUG & 0
+ 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 + 3 <= ctx->bs){
+ 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){
+ 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/mkfiles/keccak_asm.mk b/mkfiles/keccak_asm.mk
new file mode 100644
index 0000000..10f7635
--- /dev/null
+++ b/mkfiles/keccak_asm.mk
@@ -0,0 +1,13 @@
+# Makefile for Keccak
+ALGO_NAME := KECCAK_ASM
+
+# comment out the following line for removement of Keccak from the build process
+HASHES += $(ALGO_NAME)
+
+$(ALGO_NAME)_DIR := keccak/
+$(ALGO_NAME)_INCDIR := memxor/ hfal/
+$(ALGO_NAME)_OBJ := keccak-stub.o keccak-asm.o memxor.o rotate64.o
+$(ALGO_NAME)_TESTBIN := main-keccak-test.o hfal_keccak.o $(CLI_STD) $(HFAL_STD)
+$(ALGO_NAME)_NESSIE_TEST := test nessie
+$(ALGO_NAME)_PERFORMANCE_TEST := performance
+