X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-cast6-test.c;h=30d49f8d5579f2b050254b5be8ac721efa50d842;hb=2c909fca2a13cd76a526515bda5d0292483d7a55;hp=a2599741e045e2178029b6b2bda274e9e81a5257;hpb=079e93231b2a1227137399f064f13914938b2f67;p=avr-crypto-lib.git

diff --git a/test_src/main-cast6-test.c b/test_src/main-cast6-test.c
index a259974..30d49f8 100644
--- a/test_src/main-cast6-test.c
+++ b/test_src/main-cast6-test.c
@@ -3,22 +3,20 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "cast6.h"
-#include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_cast6.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <avr/pgmspace.h>
+char *algo_name = "CAST-256";
 
-char* algo_name = "CAST-256";
+const bcdesc_t *const algolist[] PROGMEM = {
+	(bcdesc_t*)&cast6_desc,
+	NULL
+};
 
 /*****************************************************************************
  *  additional validation-functions											 *
@@ -26,22 +24,7 @@ char* algo_name = "CAST-256";
 
 
 void testrun_nessie_cast6(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(cast6_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)cast6_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)cast6_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)cast6_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);
 }
 
 void testrun_rfc_cast6(void){
@@ -104,39 +87,9 @@ void testrun_rfc_cast6(void){
 }
 
 void testrun_performance_cast6(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[16], data[16];
-	cast6_ctx_t ctx;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 16);
-	memset(data, 0, 16);
-	
-	startTimer(1);
-	cast6_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);
-	cast6_enc(data, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	startTimer(1);
-	cast6_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);
 }
+
 /*****************************************************************************
  *  main																	 *
  *****************************************************************************/
@@ -146,7 +99,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_cast6 },
 	{ test_str,        NULL, testrun_rfc_cast6},
 	{ performance_str, NULL, testrun_performance_cast6},
@@ -155,13 +108,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
-	for(;;){
-		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		cli_putstr(algo_name);
-		cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-		cmd_interface(cmdlist);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
 }