X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-cscipher-test.c;h=eb49a4500281a58f391dc85a4849bd0584058496;hb=44bd9d38e15d4b03486f4cf52dd9bbf2f97e6e17;hp=4501c35cc749acbea9d42d08bcb7026c5fc011b5;hpb=0542221a3e793e4455e84b271b07aa0959d5dfb3;p=avr-crypto-lib.git

diff --git a/test_src/main-cscipher-test.c b/test_src/main-cscipher-test.c
index 4501c35..eb49a45 100644
--- a/test_src/main-cscipher-test.c
+++ b/test_src/main-cscipher-test.c
@@ -27,7 +27,7 @@
 #include "debug.h"
 
 #include "cscipher.h"
-#include "nessie_bc_test.h"
+#include "bcal-nessie.h"
 #include "cli.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
@@ -39,7 +39,7 @@
 
 char* algo_name = "CS-Cipher";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const algolist[] PROGMEM = {
 	(bcdesc_t*)&cscipher_desc,
 	NULL
 };
@@ -53,17 +53,7 @@ void cscipher_init_dummy(const uint8_t* key, uint16_t keysize_b, void* ctx){
 }
 
 void testrun_nessie_cscipher(void){
-	nessie_bc_init();
-	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(cscipher_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)cscipher_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)cscipher_dec;
-	nessie_bc_ctx.cipher_free = (nessie_bc_free_fpt)NULL;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)cscipher_init_dummy;
-	
-	nessie_bc_run();
+	bcal_nessie(&cscipher_desc);
 }
 
 void testrun_cscipher(void){
@@ -148,7 +138,7 @@ const char longtest_str[]    PROGMEM = "longtest";
 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_cscipher },
 	{ test_str,        NULL, testrun_cscipher},
 	{ longtest_str,    NULL, testrun_long_cscipher},