X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-seed-test.c;h=b4c957c74d1a5b6dd97d9c971901e7b9491f60bb;hb=47d2a52aeb2ef0150c252b8aa8b21b2139216feb;hp=30433b8400598519fe0f364e382217cf8e7818f5;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;p=avr-crypto-lib.git

diff --git a/test_src/main-seed-test.c b/test_src/main-seed-test.c
index 30433b8..b4c957c 100644
--- a/test_src/main-seed-test.c
+++ b/test_src/main-seed-test.c
@@ -32,11 +32,11 @@
 #include "debug.h"
 
 #include "seed.h"
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_seed.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_seed.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -44,7 +44,7 @@
 
 char* algo_name = "Seed";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const algolist[] PROGMEM = {
 	(bcdesc_t*)&seed_desc,
 	NULL
 };
@@ -56,16 +56,7 @@ void seed_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 }
 
 void testrun_nessie_seed(void){
-	nessie_bc_ctx.blocksize_B =  16;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = sizeof(seed_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)seed_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)seed_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)seed_genctx_dummy;
-	
-	nessie_bc_run();
-	
+	bcal_nessie_multiple(algolist);
 }
 
 
@@ -140,7 +131,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_seed},
 	{ test_str,        NULL, testrun_seed},
 	{ performance_str, NULL, testrun_performance_seed},