X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-twister-test.c;h=6e23154ed378cb2ce3ef71d83d5c8c9fabfa5ac4;hb=45d15fcc098c9eece5c39b5e421a1706f187a0d3;hp=b4efd944763823e7b4e4392cdb9d4e49ba6a93fa;hpb=b8d6b2bd3ddea45506f584c7d44fe5fff0557ed1;p=avr-crypto-lib.git

diff --git a/test_src/main-twister-test.c b/test_src/main-twister-test.c
index b4efd94..6e23154 100644
--- a/test_src/main-twister-test.c
+++ b/test_src/main-twister-test.c
@@ -21,10 +21,8 @@
  * 
 */
 
-#include "config.h"
 
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "twister-small.h"
 #include "twister-large.h"
@@ -39,15 +37,9 @@
 #include "hfal-test.h"
 #include "shavs.h"
 
-
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include "cli.h"
-
 char* algo_name = "TWISTER";
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t* const algolist[] PROGMEM = {
 	(hfdesc_t*)&twister224_desc,
 	(hfdesc_t*)&twister256_desc,
 	(hfdesc_t*)&twister384_desc,
@@ -127,7 +119,7 @@ const char shavs_list_str[]  PROGMEM = "shavs_list";
 const char shavs_set_str[]   PROGMEM = "shavs_set";
 const char shavs_test1_str[] PROGMEM = "shavs_test1";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,          NULL, testrun_nessie_twister},
 	{ test_str,            NULL, testrun_twister},
 	{ performance_str,     NULL, testrun_performance_twister},
@@ -139,16 +131,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-	DEBUG_INIT();
-	
-	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;	 	
-	shavs_algolist=(hfdesc_t**)algolist;
+    main_setup();
+
+    shavs_algolist=(hfdesc_t**)algolist;
 	shavs_algo=(hfdesc_t*)&twister256_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);
 	}
 }