clean up

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

diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c
index 5a648b32bbd18c4e3752ff05491ceb61f85200e3..2192816a7d177af595821c1d07896f87f11c25ae 100644 (file)
--- a/test_src/main-skipjack-test.c
+++ b/test_src/main-skipjack-test.c
@@ -22,14 +22,16 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "skipjack.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_skipjack.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -38,6 +40,10 @@
 
 char* algo_name = "Skipjack";
 
+const bcdesc_t* algolist[] PROGMEM = {
+       (bcdesc_t*)&skipjack_desc,
+       NULL
+};
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
@@ -59,32 +65,7 @@ void testrun_nessie_skipjack(void){
 
 
 void testrun_performance_skipjack(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[10], data[8];
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(key,  0, 10);
-       memset(data, 0,  8);
-       
-       startTimer(1);
-       skipjack_enc(data, key);
-       t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
-       
-       
-       startTimer(1);
-       skipjack_dec(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);
 }
 
 /*****************************************************************************
@@ -92,23 +73,23 @@ void testrun_performance_skipjack(void){
  *****************************************************************************/
 
 void testencrypt(uint8_t* block, uint8_t* key){
-       uart_putstr("\r\n==testy-encrypt==\r\n key: ");
-       uart_hexdump(key,10);
-       uart_putstr("\r\n plain: ");
-       uart_hexdump(block,8);
+       cli_putstr("\r\n==testy-encrypt==\r\n key: ");
+       cli_hexdump(key,10);
+       cli_putstr("\r\n plain: ");
+       cli_hexdump(block,8);
        skipjack_enc(block,key);
-       uart_putstr("\r\n crypt: ");
-       uart_hexdump(block,8);
+       cli_putstr("\r\n crypt: ");
+       cli_hexdump(block,8);
 }
 
 void testdecrypt(uint8_t* block, uint8_t* key){
-       uart_putstr("\r\n==testy-decrypt==\r\n key: ");
-       uart_hexdump(key,10);
-       uart_putstr("\r\n crypt: ");
-       uart_hexdump(block,8);
+       cli_putstr("\r\n==testy-decrypt==\r\n key: ");
+       cli_hexdump(key,10);
+       cli_putstr("\r\n crypt: ");
+       cli_hexdump(block,8);
        skipjack_dec(block,key);
-       uart_putstr("\r\n plain: ");
-       uart_hexdump(block,8);
+       cli_putstr("\r\n plain: ");
+       cli_hexdump(block,8);
 }
 
 void testrun_skipjack(void){
@@ -152,13 +133,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);
        }
 }