X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-cast6-test.c;h=c295b699aefb93e4bb9f49b584aaa6b9c681ce0d;hb=b8d6b2bd3ddea45506f584c7d44fe5fff0557ed1;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..c295b69 100644
--- a/test_src/main-cast6-test.c
+++ b/test_src/main-cast6-test.c
@@ -4,14 +4,16 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "cast6.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal_cast6.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -20,6 +22,11 @@
 
 char* algo_name = "CAST-256";
 
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&cast6_desc,
+	NULL
+};
+
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -104,39 +111,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																	 *
  *****************************************************************************/
@@ -156,8 +133,8 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 int main (void){
 	DEBUG_INIT();
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+	cli_rx = (cli_rx_fpt)uart0_getc;
+	cli_tx = (cli_tx_fpt)uart0_putc;	 	
 	for(;;){
 		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
 		cli_putstr(algo_name);