X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-cast5-test.c;h=6c0af07665d368066c64db3d8a3a4823d897d367;hp=4d2530c03abfc15a9360fb9339a8b2ab07038b6b;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=83d0614d8b17eac97f891f7de2bb3ef265751dea

diff --git a/test_src/main-cast5-test.c b/test_src/main-cast5-test.c
index 4d2530c..6c0af07 100644
--- a/test_src/main-cast5-test.c
+++ b/test_src/main-cast5-test.c
@@ -1,7 +1,7 @@
 /* main-cast5-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,36 +21,27 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include <cast5.h>
-#include "nessie_bc_test.h"
 #include "performance_test.h"
-#include "cli.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_cast5.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+char *algo_name = "cast-128 (cast5)";
 
-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 +143,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 +155,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},
@@ -207,14 +164,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);
 	}
 }