X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-tdes-test.c;h=45861990e0a1b244e9a1b17a3e97c9792b445117;hb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;hp=f32c972a58f24d637a1e9ad8a453c60bc8589723;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-tdes-test.c b/test_src/main-tdes-test.c
index f32c972..4586199 100644
--- a/test_src/main-tdes-test.c
+++ b/test_src/main-tdes-test.c
@@ -22,14 +22,17 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "des.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_tdes.h"
+#include "bcal/bcal_tdes2.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -37,6 +40,12 @@
 
 char* algo_name = "TDES";
 
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&tdes_desc,
+	(bcdesc_t*)&tdes2_desc,
+	NULL
+};
+
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -67,31 +76,7 @@ void testrun_nessie_tdes(void){
 
 
 void testrun_performance_tdes(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[8*3], data[8];
-	
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 8*3);
-	memset(data, 0, 8);
-	
-	startTimer(1);
-	tdes_enc(data, data, key);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	startTimer(1);
-	tdes_dec(data, data, key);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	uart_putstr_P(PSTR("\r\n"));
+	bcal_performance_multiple(algolist);
 }
 /*****************************************************************************
  *  main																	 *
@@ -112,13 +97,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 int main (void){
 	DEBUG_INIT();
-	uart_putstr("\r\n");
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+	
+	cli_rx = (cli_rx_fpt)uart0_getc;
+	cli_tx = (cli_tx_fpt)uart0_putc;	 	
 	for(;;){
-		uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		uart_putstr(algo_name);
-		uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+		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);
 	}
 }