optimizing norx32

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

diff --git a/test_src/main-hmac-sha256-test.c b/test_src/main-hmac-sha256-test.c
index b98fb203c6e59c3a8976eed662eaeb01dce0e20e..1aad96676ea03e5a1c87b548cb6059f01a22dccd 100644 (file)
--- a/test_src/main-hmac-sha256-test.c
+++ b/test_src/main-hmac-sha256-test.c
@@ -21,21 +21,14 @@
  * 
 */
 
-#include "config.h"
+#include "main-test-common.h"
 
-#include "uart_i.h"
-#include "debug.h"
-
-#include "sha256/sha256.h"
+#include "sha256.h"
 #include "hmac-sha256.h"
 
-#include "cli.h"
 #include "nessie_mac_test.h"
 
-#include <stdint.h>
-#include <string.h>
-
-char* algo_name = "HMAC-SHA256";
+char *algo_name = "HMAC-SHA256";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -83,7 +76,7 @@ const char test_str[]        PROGMEM = "test";
 /* const char performance_str[] PROGMEM = "performance"; */
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,      NULL, testrun_nessie_hmacsha256},
        { test_str,        NULL, testrun_hmacsha256},
 /*     { performance_str, NULL, testrun_performance_hmacsha256}, */
@@ -92,14 +85,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-       DEBUG_INIT();
-       
-       cli_rx = (cli_rx_fpt)uart0_getc;
-       cli_tx = (cli_tx_fpt)uart0_putc;                
-       for(;;){
-               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);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
        }
 }