X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-shacal2_enc-test.c;h=bf631ebb29bd2ed3f7352c7e20d4296d5a2ea578;hb=872dff3138536a68b6dd96b182a386d242bee6cb;hp=53fcc8ee243bdc0df42ddd1f65a93b41a1dc94a1;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-shacal2_enc-test.c b/test_src/main-shacal2_enc-test.c
index 53fcc8e..bf631eb 100644
--- a/test_src/main-shacal2_enc-test.c
+++ b/test_src/main-shacal2_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 "shacal2_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 = "Shacal2 encryption only";
 
 /*****************************************************************************
@@ -76,7 +68,7 @@ void testrun_performance_shacal2enc(void){
 	t = stopTimer();
 	print_time_P(PSTR("\tencrypt time: "), t);
 	
-	uart_putstr_P(PSTR("\r\n"));
+	cli_putstr_P(PSTR("\r\n"));
 }
 
 /*****************************************************************************
@@ -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_shacal2enc},
 	{ test_str,        NULL, testrun_nessie_shacal2enc},
 	{ performance_str, NULL, testrun_performance_shacal2enc},
@@ -97,14 +89,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-	uart_putstr("\r\n");
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
-	for(;;){
-		uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		uart_putstr(algo_name);
-		uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-		cmd_interface(cmdlist);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
 }