X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-serpent-test.c;h=ec456d66ebaa2a6876e7b0ed7dac37d2b08ea27e;hb=b97b5aeaa3569443d9b95a77a388c6615b33f9e3;hp=db97c86a8c967939b79a2d26f965c34703270d45;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;p=avr-crypto-lib.git

diff --git a/test_src/main-serpent-test.c b/test_src/main-serpent-test.c
index db97c86..ec456d6 100644
--- a/test_src/main-serpent-test.c
+++ b/test_src/main-serpent-test.c
@@ -27,11 +27,11 @@
 #include "debug.h"
 
 #include "serpent.h"
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_serpent.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_serpent.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -39,7 +39,7 @@
 
 char* algo_name = "Serpent";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const algolist[] PROGMEM = {
 	(bcdesc_t*)&serpent_desc,
 	NULL
 };
@@ -52,21 +52,7 @@ void serpent_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 }
 
 void testrun_nessie_serpent(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(serpent_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)serpent_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)serpent_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)serpent_genctx_dummy;
-	
-	nessie_bc_run();
-	
-	nessie_bc_ctx.keysize_b   = 192;
-	nessie_bc_run();
-	
-	nessie_bc_ctx.keysize_b   = 256;
-	nessie_bc_run();
+	bcal_nessie_multiple(algolist);
 }
 
 void testrun_test_serpent(void){
@@ -95,7 +81,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_serpent},
 	{ test_str,        NULL, testrun_test_serpent},
 	{ performance_str, NULL, testrun_performance_serpent},