X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-cubehash-test.c;h=0d22e07a2e2632d04f8359999bf04f9ab6e20d17;hb=2c909fca2a13cd76a526515bda5d0292483d7a55;hp=2ae29e7cfbee56586553dab3893571770e056277;hpb=2f9b301c15c03faa76b7f9c95b18eadaa8d013ae;p=avr-crypto-lib.git

diff --git a/test_src/main-cubehash-test.c b/test_src/main-cubehash-test.c
index 2ae29e7..0d22e07 100644
--- a/test_src/main-cubehash-test.c
+++ b/test_src/main-cubehash-test.c
@@ -21,12 +21,9 @@
  *
 */
 
-#include "config.h"
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "cubehash.h"
-#include "cli.h"
 #include "hfal_cubehash.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
@@ -35,14 +32,10 @@
 #include "hfal-performance.h"
 #include "hfal-test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+char *algo_name = "CubeHash";
 
-char* algo_name = "CubeHash";
 
-
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
 	(hfdesc_t*)&cubehash224_desc,
 	(hfdesc_t*)&cubehash256_desc,
 	(hfdesc_t*)&cubehash384_desc,
@@ -86,7 +79,7 @@ const char shavs_set_str[]   PROGMEM = "shavs_set";
 const char shavs_test1_str[] PROGMEM = "shavs_test1";
 const char shavs_test3_str[] PROGMEM = "shavs_test3";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,                NULL, testrun_nessie_cubehash     },
 	{ test256_str,               NULL, cubehash256_test0           },
 	{ performance_str,           NULL, performance_cubehash        },
@@ -99,21 +92,12 @@ 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_algo=(hfdesc_t*)&cubehash256_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);
 	}
 }