clean up

[avr-crypto-lib.git] / test_src / main-cast5-test.c

diff --git a/test_src/main-cast5-test.c b/test_src/main-cast5-test.c
index 4d2530c03abfc15a9360fb9339a8b2ab07038b6b..392d8c09ecee4e9403320d8618a2b234f4d22b3a 100644 (file)
--- a/test_src/main-cast5-test.c
+++ b/test_src/main-cast5-test.c
@@ -22,13 +22,15 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include <cast5.h>
 #include "nessie_bc_test.h"
 #include "performance_test.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_cast5.h"
 #include "cli.h"
 
 #include <stdint.h>
@@ -37,6 +39,11 @@
 
 char* algo_name = "cast-128 (cast5)";
 
+const bcdesc_t* algolist[] PROGMEM = {
+       (bcdesc_t*)&cast5_desc,
+       NULL
+};
+
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
@@ -152,41 +159,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);
 }
 
 /*****************************************************************************
@@ -209,8 +182,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);