X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-whirlpool-test.c;h=1e1cea3d236a2e8a270d67e00447294725b3b149;hb=2e0998249aeec3ce8509af80cc56fb6a49f3268d;hp=c2cc71b7e645bbda04bafdda95a57d337023099e;hpb=701cee0d98aab48dd3192c8cc7c77eb42581bc56;p=avr-crypto-lib.git

diff --git a/test_src/main-whirlpool-test.c b/test_src/main-whirlpool-test.c
index c2cc71b..1e1cea3 100644
--- a/test_src/main-whirlpool-test.c
+++ b/test_src/main-whirlpool-test.c
@@ -21,10 +21,7 @@
  *
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "whirlpool.h"
 #include "nessie_hash_test.h"
@@ -32,17 +29,13 @@
 #include "hfal-performance.h"
 #include "hfal-nessie.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include "cli.h"
 #include "shavs.h"
 #include "hfal_whirlpool.h"
 #include "dump.h"
 
-char* algo_name = "Whirlpool";
+char *algo_name = "Whirlpool";
 
-const hfdesc_t* const algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
 	(hfdesc_t*)&whirlpool_desc,
 	NULL
 };
@@ -156,16 +149,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*)&whirlpool_desc;
 	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);
+	    welcome_msg(algo_name);
+	    cmd_interface(cmdlist);
 	}
 }