moving from uart to cli

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

diff --git a/test_src/main-sha256-test.c b/test_src/main-sha256-test.c
index a4ba9f9cdca777ed0c80108f07708d2cad19ca0c..eafc4a390cb8dc3f5caaa0bbed79a99cd7e73240 100644 (file)
--- a/test_src/main-sha256-test.c
+++ b/test_src/main-sha256-test.c
@@ -34,6 +34,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include "cli.h"
+#include "shavs.h"
+#include "hfal_sha256.h"
+#include "dump.h"
 
 char* algo_name = "SHA-256";
 
@@ -75,27 +78,27 @@ void testrun_performance_sha256(void){
        startTimer(1);
        sha256_init(&ctx);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
+       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
+       cli_putstr(str);
        
        
        startTimer(1);
        sha256_nextBlock(&ctx, data);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tone-block time: "));
+       cli_putstr_P(PSTR("\r\n\tone-block time: "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
+       cli_putstr(str);
        
        
        startTimer(1);
        sha256_lastBlock(&ctx, data, 0);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tlast block time: "));
+       cli_putstr_P(PSTR("\r\n\tlast block time: "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
+       cli_putstr(str);
        
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr_P(PSTR("\r\n"));
 }
 
 /*****************************************************************************
@@ -106,24 +109,39 @@ const char nessie_str[]      PROGMEM = "nessie";
 const char test_str[]        PROGMEM = "test";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
+const char shavs_list_str[]  PROGMEM = "shavs_list";
+const char shavs_set_str[]   PROGMEM = "shavs_set";
+const char shavs_test1_str[] PROGMEM = "shavs_test1";
+const char dump_str[]        PROGMEM = "dump";
+
+const hfdesc_t* algolist[] PROGMEM = {
+       (hfdesc_t*)&sha256_desc,
+       NULL
+};
 
 cmdlist_entry_t cmdlist[] PROGMEM = {
-       { nessie_str,      NULL, testrun_nessie_sha256},
-       { test_str,        NULL, testrun_nessie_sha256},
-       { performance_str, NULL, testrun_performance_sha256},
-       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
-       { NULL,            NULL, NULL}
+       { nessie_str,          NULL, testrun_nessie_sha256},
+       { test_str,            NULL, testrun_nessie_sha256},
+       { performance_str,     NULL, testrun_performance_sha256},
+       { echo_str,        (void*)1, (void_fpt)echo_ctrl},
+       { shavs_list_str,      NULL, shavs_listalgos},
+       { shavs_set_str,   (void*)1, (void_fpt)shavs_setalgo},
+       { shavs_test1_str,     NULL, shavs_test1},
+       { dump_str,        (void*)1, (void_fpt)dump},
+       { NULL,                NULL, NULL}
 };
 
 int main (void){
        DEBUG_INIT();
-       uart_putstr("\r\n");
+       
        cli_rx = uart_getc;
        cli_tx = uart_putc;             
+       shavs_algolist=(hfdesc_t**)algolist;
+       shavs_algo=(hfdesc_t*)&sha256_desc;
        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);
        }
 }