X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-dsa-test.c;h=7516341c8b47e9f94cb97fa824a96db7ac6063fa;hb=a45c328791dc391e6432051ee0c7972ef7fd8d9a;hp=d599b77ee7c38aa6d7bcc6eee80648325be92b7e;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;p=avr-crypto-lib.git

diff --git a/test_src/main-dsa-test.c b/test_src/main-dsa-test.c
index d599b77..7516341 100644
--- a/test_src/main-dsa-test.c
+++ b/test_src/main-dsa-test.c
@@ -21,26 +21,19 @@
  *
 */
 
-#include "config.h"
+#include "main-test-common.h"
 
-#include "uart_i.h"
-#include "debug.h"
-
-#include "noekeon/noekeon.h"
-#include "noekeon/noekeon_prng.h"
-#include "bigint/bigint.h"
-#include "bigint/bigint_io.h"
+#include "noekeon.h"
+#include "noekeon_prng.h"
+#include "bigint.h"
+#include "bigint_io.h"
 #include "dsa.h"
 #include "dsa_key_blob.h"
 
-#include "cli.h"
 #include "performance_test.h"
-#include "hfal/hfal_sha1.h"
-#include "base64/base64_enc.h"
-#include "base64/base64_dec.h"
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+#include "hfal_sha1.h"
+#include "base64_enc.h"
+#include "base64_dec.h"
 
 char* algo_name = "DSA";
 
@@ -169,7 +162,7 @@ const char quick_test_str[]       PROGMEM = "quick-test";
 const char performance_str[]      PROGMEM = "performance";
 const char echo_str[]             PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ reset_prng_str,       NULL, reset_prng                    },
 	{ quick_test_str,       NULL, quick_test                    },
 	{ performance_str,      NULL, testrun_performance_bigint    },
@@ -178,14 +171,10 @@ 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);
 	}
 }