X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-rc6-test.c;h=2c77bea450040d8c4f46d4dd59eb9ed8a2f7f7e4;hb=9023000e91b6065961051339700526c98f8438e8;hp=b7e7786582c6fc03b775fb272145fcf9f719f10c;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;p=avr-crypto-lib.git

diff --git a/test_src/main-rc6-test.c b/test_src/main-rc6-test.c
index b7e7786..2c77bea 100644
--- a/test_src/main-rc6-test.c
+++ b/test_src/main-rc6-test.c
@@ -27,11 +27,11 @@
 #include "debug.h"
 
 #include "rc6.h"
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_rc6.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_rc6.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -40,7 +40,7 @@
 #define RC6_ROUNDS 20
 char* algo_name = "RC6-32/20/16";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const algolist[] PROGMEM = {
 	(bcdesc_t*)&rc6_desc,
 	NULL
 };
@@ -52,24 +52,7 @@ void rc6_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
 }
 
 void testrun_nessie_rc6(void){
-	nessie_bc_init();
-	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(rc6_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)rc6_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)rc6_dec;
-	nessie_bc_ctx.cipher_free = (nessie_bc_free_fpt)rc6_free;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)rc6_init;
-	
-	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);
 }
 
 
@@ -85,7 +68,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_rc6},
 	{ test_str,        NULL, testrun_nessie_rc6},
 	{ performance_str, NULL, testrun_performance_rc6},