X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-cast5-test.c;h=56580e2c5eedbdc62ece00765419aefa263f249f;hb=cf610f6848d1a6aef4de849f9ec7895e20605583;hp=a8f88900e2ec341e362cb14eba82da359e0aa413;hpb=302f07c97444e2f5f5560dc2fd9af58d4b591d45;p=avr-crypto-lib.git

diff --git a/test_src/main-cast5-test.c b/test_src/main-cast5-test.c
index a8f8890..56580e2 100644
--- a/test_src/main-cast5-test.c
+++ b/test_src/main-cast5-test.c
@@ -27,8 +27,10 @@
 #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"
 
 #include <stdint.h>
@@ -37,20 +39,17 @@
 
 char* algo_name = "cast-128 (cast5)";
 
+const bcdesc_t* const algolist[] PROGMEM = {
+	(bcdesc_t*)&cast5_desc,
+	NULL
+};
+
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
 
 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);
 }
 
 /*****************************************************************************
@@ -152,41 +151,7 @@ void testrun_cast5(void){
 }
 
 void testrun_performance_cast5(void){
-	uint64_t t;
-	char str[6];
-	uint8_t key[16], data[16];
-	cast5_ctx_t ctx;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 16);
-	memset(data, 0, 16);
-	
-	startTimer(1);
-	cast5_init(key, 128, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	
-	startTimer(1);
-	cast5_enc(data, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	
-	startTimer(1);
-	cast5_dec(data, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	cli_putstr_P(PSTR("\r\n"));
+	bcal_performance_multiple(algolist);
 }
 
 /*****************************************************************************
@@ -198,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},