X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-skipjack-test.c;h=e3f68f5d3c0010aeeb41d0473d8936d230cdd6ea;hb=701cee0d98aab48dd3192c8cc7c77eb42581bc56;hp=2192816a7d177af595821c1d07896f87f11c25ae;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;p=avr-crypto-lib.git

diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c
index 2192816..e3f68f5 100644
--- a/test_src/main-skipjack-test.c
+++ b/test_src/main-skipjack-test.c
@@ -30,8 +30,9 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_skipjack.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_skipjack.h"
 
 #include <stdint.h>
 #include <string.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},