X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-salsa20-test.c;h=e3ad8273a630e2885d3ddabc9f3e4f49f35f3e0b;hb=2e0998249aeec3ce8509af80cc56fb6a49f3268d;hp=9e8bb2fdc71897b96778fe6769eedeec4f993b1c;hpb=cc6b183296a5852449e3324737e2a2dece788786;p=avr-crypto-lib.git

diff --git a/test_src/main-salsa20-test.c b/test_src/main-salsa20-test.c
index 9e8bb2f..e3ad827 100644
--- a/test_src/main-salsa20-test.c
+++ b/test_src/main-salsa20-test.c
@@ -18,24 +18,16 @@
 */
 
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "salsa20.h"
-#include "cli.h"
 #include "performance_test.h"
 
 #include "scal_salsa20.h"
 #include "scal-basic.h"
 #include "scal-nessie.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-char* algo_name = "Salsa20";
+char *algo_name = "Salsa20";
 
 /*****************************************************************************
  *  additional validation-functions											 *
@@ -279,15 +271,11 @@ const 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);
 	}
 }