fixing style, typos and uart

[avr-crypto-lib.git] / keccak / keccak.h

diff --git a/keccak/keccak.h b/keccak/keccak.h
index 6d31e714024345daf5f41fbbcb05ec5b6b805bce..b374ce566aaa4c926acd1111f42a2db7306c0e51 100644 (file)
--- a/keccak/keccak.h
+++ b/keccak/keccak.h
@@ -23,36 +23,34 @@
 #include <stdint.h>
 
 #define KECCAK224_BLOCKSIZE 1152
-#define KECCAK224_BLOCKSIZE_B (KECCAK224_BLOCKSIZE/8)
+#define KECCAK224_BLOCKSIZE_B (KECCAK224_BLOCKSIZE / 8)
 #define KECCAK256_BLOCKSIZE 1088
-#define KECCAK256_BLOCKSIZE_B (KECCAK256_BLOCKSIZE/8)
+#define KECCAK256_BLOCKSIZE_B (KECCAK256_BLOCKSIZE / 8)
 #define KECCAK384_BLOCKSIZE  832
-#define KECCAK384_BLOCKSIZE_B (KECCAK384_BLOCKSIZE/8)
+#define KECCAK384_BLOCKSIZE_B (KECCAK384_BLOCKSIZE / 8)
 #define KECCAK512_BLOCKSIZE  576
-#define KECCAK512_BLOCKSIZE_B (KECCAK512_BLOCKSIZE/8)
+#define KECCAK512_BLOCKSIZE_B (KECCAK512_BLOCKSIZE / 8)
 
 typedef struct{
-       uint64_t a[5][5];
-       uint16_t r, c;
-       uint8_t  d, bs;
+       uint8_t a[200];
+       uint16_t r;
+       uint8_t  bs;
 } keccak_ctx_t;
 
 
-void keccak_dump_ctx(keccak_ctx_t* ctx);
+void keccak_init(uint16_t r, 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_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_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);
+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_ */