a lot of fixes

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

diff --git a/test_src/main-present-test.c b/test_src/main-present-test.c
index 23d350644386e34fee5b67e26affb875f2ec94eb..1b981fa720a1097fd509ffe2033d38553858c181 100644 (file)
--- a/test_src/main-present-test.c
+++ b/test_src/main-present-test.c
@@ -27,11 +27,11 @@
 #include "debug.h"
 
 #include <present.h>
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_present.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_present.h"
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -39,7 +39,7 @@
 
 char* algo_name = "Present";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const algolist[] PROGMEM = {
        (bcdesc_t*)&present_desc,
        NULL
 };
@@ -51,15 +51,7 @@ void present_genctx_dummy(uint8_t* key, uint16_t keysize_b, present_ctx_t* ctx){
 }
 
 void testrun_nessie_present(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  = sizeof(present_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)present_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)present_dec;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)present_genctx_dummy;
-       
-       nessie_bc_run();        
+       bcal_nessie_multiple(algolist);
 }
 
 void testrun_selfenc(uint8_t* key, uint8_t* buffer){
@@ -113,7 +105,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_present},
        { test_str,        NULL, testrun_self_present},
        { performance_str, NULL, testrun_performance_present},