clean up

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

diff --git a/test_src/main-serpent-test.c b/test_src/main-serpent-test.c
index ae8ad161ce049a1492d72199a569e0d4dfecf815..db97c86a8c967939b79a2d26f965c34703270d45 100644 (file)
--- a/test_src/main-serpent-test.c
+++ b/test_src/main-serpent-test.c
@@ -22,14 +22,16 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "serpent.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_serpent.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -37,6 +39,11 @@
 
 char* algo_name = "Serpent";
 
+const bcdesc_t* algolist[] PROGMEM = {
+       (bcdesc_t*)&serpent_desc,
+       NULL
+};
+
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
@@ -69,49 +76,15 @@ void testrun_test_serpent(void){
        memset(key, 0, 16);
        serpent_init(key, 128, &ctx);
        for(i=0; i<33; ++i){
-               uart_putstr_P(PSTR("\r\n subkekey "));  
-               uart_hexdump(&i, 1);
-               uart_putstr_P(PSTR(" : "));     
-               uart_hexdump(ctx.k[i], 16);
+               cli_putstr_P(PSTR("\r\n subkekey "));   
+               cli_hexdump(&i, 1);
+               cli_putstr_P(PSTR(" : "));      
+               cli_hexdump(ctx.k[i], 16);
        }
 }
 
 void testrun_performance_serpent(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[32], data[16];
-       serpent_ctx_t ctx;
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(key,  0, 32);
-       memset(data, 0, 16);
-       
-       startTimer(1);
-       serpent_init(key, 0, &ctx);
-       t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
-       
-       
-       startTimer(1);
-       serpent_enc(data, &ctx);
-       t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
-       
-       
-       startTimer(1);
-       serpent_dec(data, &ctx);
-       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                                                                                                                                        *
@@ -132,13 +105,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);
        }
 }