clean up

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

diff --git a/test_src/main-present-test.c b/test_src/main-present-test.c
index 7f20922e6196e7b896ab2d17254c2886036921cb..23d350644386e34fee5b67e26affb875f2ec94eb 100644 (file)
--- a/test_src/main-present-test.c
+++ b/test_src/main-present-test.c
@@ -22,14 +22,16 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include <present.h>
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_present.h"
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -37,6 +39,10 @@
 
 char* algo_name = "Present";
 
+const bcdesc_t* algolist[] PROGMEM = {
+       (bcdesc_t*)&present_desc,
+       NULL
+};
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
@@ -58,23 +64,23 @@ void testrun_nessie_present(void){
 
 void testrun_selfenc(uint8_t* key, uint8_t* buffer){
        present_ctx_t ctx;
-       uart_putstr_P(PSTR("\r\nkey   : "));
-       uart_hexdump(key, 10);
-       uart_putstr_P(PSTR("\r\nplain : "));
-       uart_hexdump(buffer, 8);
+       cli_putstr_P(PSTR("\r\nkey   : "));
+       cli_hexdump(key, 10);
+       cli_putstr_P(PSTR("\r\nplain : "));
+       cli_hexdump(buffer, 8);
        present_init(key, 80, &ctx);
        present_enc(buffer, &ctx);
-       uart_putstr_P(PSTR("\r\ncipher: "));
-       uart_hexdump(buffer, 8);
+       cli_putstr_P(PSTR("\r\ncipher: "));
+       cli_hexdump(buffer, 8);
        present_dec(buffer, &ctx);
-       uart_putstr_P(PSTR("\r\nplain : "));
-       uart_hexdump(buffer, 8);
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr_P(PSTR("\r\nplain : "));
+       cli_hexdump(buffer, 8);
+       cli_putstr_P(PSTR("\r\n"));
 }
 
 void testrun_self_present(void){
        uint8_t buffer[8], key[10];
-       uart_putstr_P(PSTR("\r\n\r\n=== Testvectors from the paper ===\r\n"));
+       cli_putstr_P(PSTR("\r\n\r\n=== Testvectors from the paper ===\r\n"));
        
        memset(buffer, 0, 8);
        memset(key, 0, 10);
@@ -95,32 +101,7 @@ void testrun_self_present(void){
 }
 
 void testrun_performance_present(void){
-       uint64_t t;
-       uint8_t key[10], data[8];
-       present_ctx_t ctx;
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(key,  0, 10);
-       memset(data, 0,  8);
-       
-       startTimer(1);
-       present_init(key, 80, &ctx);
-       t = stopTimer();
-       print_time_P(PSTR("\tctx-gen time: "),t);
-       
-       startTimer(1);
-       present_enc(data, &ctx);
-       t = stopTimer();
-       print_time_P(PSTR("\tencrypt time: "), t);
-       
-       startTimer(1);
-       present_dec(data, &ctx);
-       t = stopTimer();
-       print_time_P(PSTR("\tdecrypt time: "), t);
-       
-       uart_putstr_P(PSTR("\r\n"));
+       bcal_performance_multiple(algolist);
 }
 
 /*****************************************************************************
@@ -142,13 +123,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);
        }
 }