From: bg <daniel.otte@rub.de>
Date: Sun, 26 Aug 2012 23:13:08 +0000 (+0200)
Subject: some files were not adapted in the previous commit
X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=commitdiff_plain;h=cd6cc49401a7868a8ce64125e7246a29f2632952

some files were not adapted in the previous commit
---

diff --git a/test_src/main-echo-test.c b/test_src/main-echo-test.c
index 552c063..ff2d7a3 100644
--- a/test_src/main-echo-test.c
+++ b/test_src/main-echo-test.c
@@ -166,20 +166,12 @@ const cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
+    main_setup();
 
-	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;
-	shavs_algolist=(hfdesc_t**)algolist;
+    shavs_algolist=(hfdesc_t**)algolist;
 	shavs_algo=(hfdesc_t*)&echo256_desc;
 	for(;;){
-		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		cli_putstr(algo_name);
-		cli_putstr_P(PSTR("; "));
-		cli_putstr(__DATE__);
-		cli_putstr_P(PSTR(" "));
-		cli_putstr(__TIME__);
-		cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+	    welcome_msg(algo_name);
 
 		cmd_interface(cmdlist);
 	}
diff --git a/test_src/main-skein-test.c b/test_src/main-skein-test.c
index e93f9d1..e38bf87 100644
--- a/test_src/main-skein-test.c
+++ b/test_src/main-skein-test.c
@@ -21,16 +21,12 @@
  *
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "skein.h"
 #include "hfal_skein256.h"
 #include "hfal_skein512.h"
 #include "hfal_skein1024.h"
-#include "cli.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
@@ -38,11 +34,6 @@
 #include "hfal-nessie.h"
 #include "hfal-basic.h"
 
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
 char* algo_name = "Skein";
 
 const hfdesc_t* const algolist[] PROGMEM = {
@@ -275,21 +266,13 @@ const cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
+    main_setup();
 
-	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;
-	shavs_algolist=(hfdesc_t**)algolist;
+    shavs_algolist=(hfdesc_t**)algolist;
 	shavs_algo=(hfdesc_t*)&skein256_256_desc;
-	for(;;){
-		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		cli_putstr(algo_name);
-		cli_putstr_P(PSTR("; "));
-		cli_putstr(__DATE__);
-		cli_putstr_P(PSTR(" "));
-		cli_putstr(__TIME__);
-		cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
 
+	for(;;){
+	    welcome_msg(algo_name);
 		cmd_interface(cmdlist);
 	}
 }