+RC5 +size-statistics tool +small modification to nessie_bc_test (optional free(...

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

diff --git a/nessie_bc_test.h b/nessie_bc_test.h
index b51081052540c39e5305bf78e07cc111ef8e37ef..959bbe227dc431d778992537fa08b8514d5bc91c 100644 (file)
--- a/nessie_bc_test.h
+++ b/nessie_bc_test.h
@@ -3,21 +3,27 @@
 
 #include <stdint.h>
 
-typedef struct nessie_ctx_st{
-       uint16_t keysize;
+typedef void (*nessie_bc_gen_fpt)(uint8_t* key, uint16_t keysize_b, void* ctx);
+typedef void (*nessie_bc_free_fpt)(void* ctx);
+typedef void (*nessie_bc_enc_fpt)(void* buffer, void* ctx);
+typedef void (*nessie_bc_dec_fpt)(void* buffer, void* ctx);
+
+typedef struct nessie_bc_ctx_st{
+       uint16_t keysize_b;
        uint16_t blocksize_B;
        uint16_t ctx_size_B;
        char* name; 
-       void (*cipher_genctx)(uint8_t* key, uint16_t keysize, void* ctx);
-       void (*cipher_enc)(void* buffer, void* ctx);
-       void (*cipher_dec)(void* buffer, void* ctx);
-} nessie_ctx_t; 
+       nessie_bc_gen_fpt  cipher_genctx;
+       nessie_bc_free_fpt cipher_free;
+       nessie_bc_enc_fpt  cipher_enc;
+       nessie_bc_dec_fpt  cipher_dec;
+} nessie_bc_ctx_t; 
+
 
+extern nessie_bc_ctx_t nessie_bc_ctx;
 
-extern nessie_ctx_t nessie_ctx;
+void nessie_bc_run(void);
+void nessie_bc_init(void);
 
-void nessie_enc(uint8_t* key, uint8_t* pt);
-void nessie_dec(uint8_t* key, uint8_t* ct);
-void nessie_run(void);
 
 #endif /*NESSIE_BC_TEST_H_*/