X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-cast5-test.c;h=56580e2c5eedbdc62ece00765419aefa263f249f;hb=9aebf1891ebd2ab61830988a176e8a9da974d93a;hp=3db72a7445a24c73c5edd367608fb49b5b37cf1a;hpb=b8d6b2bd3ddea45506f584c7d44fe5fff0557ed1;p=avr-crypto-lib.git

diff --git a/test_src/main-cast5-test.c b/test_src/main-cast5-test.c
index 3db72a7..56580e2 100644
--- a/test_src/main-cast5-test.c
+++ b/test_src/main-cast5-test.c
@@ -27,9 +27,9 @@
 #include "debug.h"
 
 #include <cast5.h>
-#include "nessie_bc_test.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
+#include "bcal-nessie.h"
 #include "bcal_cast5.h"
 #include "cli.h"
 
@@ -39,7 +39,7 @@
 
 char* algo_name = "cast-128 (cast5)";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const algolist[] PROGMEM = {
 	(bcdesc_t*)&cast5_desc,
 	NULL
 };
@@ -49,15 +49,7 @@ const bcdesc_t* algolist[] PROGMEM = {
  *****************************************************************************/
 
 void testrun_nessie_cast5(void){
-	nessie_bc_ctx.blocksize_B =   8;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = sizeof(cast5_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)cast5_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)cast5_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)cast5_init;
-	
-	nessie_bc_run();
+	bcal_nessie_multiple(algolist);
 }
 
 /*****************************************************************************
@@ -171,7 +163,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_cast5},
 	{ test_str,        NULL, testrun_cast5},
 	{ performance_str, NULL, testrun_performance_cast5},