X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-shacal1_enc-test.c;h=e3267b54d6ed7a2245d1e5f31af28392b8620c4f;hb=a45c328791dc391e6432051ee0c7972ef7fd8d9a;hp=a4ff3c62d684287e0747ddcc4b5d78668d9488b4;hpb=83d0614d8b17eac97f891f7de2bb3ef265751dea;p=avr-crypto-lib.git

diff --git a/test_src/main-shacal1_enc-test.c b/test_src/main-shacal1_enc-test.c
index a4ff3c6..e3267b5 100644
--- a/test_src/main-shacal1_enc-test.c
+++ b/test_src/main-shacal1_enc-test.c
@@ -21,20 +21,12 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "shacal1_enc.h"
 #include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
 char* algo_name = "Shacal1 encryption only";
 
 /*****************************************************************************
@@ -88,7 +80,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_shacal1enc},
 	{ test_str,        NULL, testrun_nessie_shacal1enc},
 	{ performance_str, NULL, testrun_performance_shacal1enc},
@@ -97,14 +89,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-	
-	cli_rx = uart_getc;
-	cli_tx = uart_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);
 	}
 }