switching to new main-*-test layout and to stdio streams

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

diff --git a/test_src/main-shabal-test.c b/test_src/main-shabal-test.c
index bcdc57aeef20e90b94527ff138a191221ce71868..638f5b793208d3ae248da76070333f770e4e5be8 100644 (file)
--- a/test_src/main-shabal-test.c
+++ b/test_src/main-shabal-test.c
@@ -21,13 +21,10 @@
  *
 */
 
-#include "config.h"
 
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "shabal.h"
-#include "cli.h"
 #include "hfal_shabal.h"
 #include "hfal-test.h"
 #include "hfal-nessie.h"
@@ -36,14 +33,9 @@
 #include "nessie_hash_test.h"
 #include "performance_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
 char* algo_name = "Shabal";
 
-
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t* const algolist[] PROGMEM = {
        (hfdesc_t*)&shabal192_desc,
        (hfdesc_t*)&shabal224_desc,
        (hfdesc_t*)&shabal256_desc,
@@ -203,7 +195,7 @@ const char shavs_test1_str[] PROGMEM = "shavs_test1";
 const char shavs_test2_str[] PROGMEM = "shavs_test2";
 const char shavs_test3_str[] PROGMEM = "shavs_test3";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,          NULL, testrun_nessie_shabal          },
        { test_str,            NULL, testrun_stdtest_shabal         },
        { testinit192_str,     NULL, testinit_192                   },
@@ -220,21 +212,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-       DEBUG_INIT();
+    main_setup();
 
-       cli_rx = (cli_rx_fpt)uart0_getc;
-       cli_tx = (cli_tx_fpt)uart0_putc;
-       shavs_algolist=(hfdesc_t**)algolist;
+    shavs_algolist=(hfdesc_t**)algolist;
        shavs_algo=(hfdesc_t*)&shabal256_desc;
+
        for(;;){
-               cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-               cli_putstr(algo_name);
-               cli_putstr_P(PSTR("; "));
-               cli_putstr(__DATE__);
-               cli_putstr_P(PSTR(" "));
-               cli_putstr(__TIME__);
-               cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
-               cmd_interface(cmdlist);
+           welcome_msg(algo_name);
+           cmd_interface(cmdlist);
        }
 }