X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-omac-noekeon-test.c;h=fae8b35bb833168d64e039d339f21057d9dcb927;hb=872dff3138536a68b6dd96b182a386d242bee6cb;hp=4e85268466a6b10a41859060b04a6d36a0532a2a;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;p=avr-crypto-lib.git

diff --git a/test_src/main-omac-noekeon-test.c b/test_src/main-omac-noekeon-test.c
index 4e85268..fae8b35 100644
--- a/test_src/main-omac-noekeon-test.c
+++ b/test_src/main-omac-noekeon-test.c
@@ -21,22 +21,14 @@
  * 
 */
 
-#include "config.h"
+#include "main-test-common.h"
 
-#include "uart_i.h"
-#include "debug.h"
-
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 #include "omac_noekeon.h"
 
-#include "cli.h"
 #include "nessie_mac_test.h"
 #include "performance_test.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
 char* algo_name = "OMAC-Noekeon";
 
 /*****************************************************************************
@@ -157,7 +149,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_omac_noekeon },
 	{ test_str,        NULL, testrun_test_omac_noekeon},
 	{ performance_str, NULL, testrun_performance_omac_noekeon},
@@ -166,14 +158,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);
 	}
 }