a lot of fixes

[avr-crypto-lib.git] / test_src / main-skipjack-test.c

diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c
index 3f1c75fd308b420fd8e31532c7be6ed39be695b4..e3f68f5d3c0010aeeb41d0473d8936d230cdd6ea 100644 (file)
--- a/test_src/main-skipjack-test.c
+++ b/test_src/main-skipjack-test.c
@@ -31,6 +31,7 @@
 #include "cli.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
+#include "bcal-nessie.h"
 #include "bcal_skipjack.h"
 
 #include <stdint.h>
@@ -40,7 +41,7 @@
 
 char* algo_name = "Skipjack";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const algolist[] PROGMEM = {
        (bcdesc_t*)&skipjack_desc,
        NULL
 };
@@ -52,15 +53,7 @@ void skipjack_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 }
 
 void testrun_nessie_skipjack(void){
-       nessie_bc_ctx.blocksize_B =   8;
-       nessie_bc_ctx.keysize_b   =  80;
-       nessie_bc_ctx.name        = algo_name;
-       nessie_bc_ctx.ctx_size_B  = 10;
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)skipjack_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)skipjack_dec;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)skipjack_genctx_dummy;
-       
-       nessie_bc_run();
+       bcal_nessie_multiple(algolist);
 }
 
 
@@ -123,7 +116,7 @@ const char test_str[]        PROGMEM = "test";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,      NULL, testrun_nessie_skipjack},
        { test_str,        NULL, testrun_skipjack},
        { performance_str, NULL, testrun_performance_skipjack},