X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-jh-test.c;h=eebdeef33fb565df93c32bf8b0625fede9bb3c97;hp=c8fba92832d0a5bb0bebdb2cc80ba001a7ce7a43;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=e2a5b474634f8c07d75119c2affdc6bb7f4e7848

diff --git a/test_src/main-jh-test.c b/test_src/main-jh-test.c
index c8fba92..eebdeef 100644
--- a/test_src/main-jh-test.c
+++ b/test_src/main-jh-test.c
@@ -1,7 +1,7 @@
 /* main-jh-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2006-2010 Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,10 +21,7 @@
  *
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "jh_simple.h"
 #include "hfal_jh.h"
@@ -32,18 +29,13 @@
 #include "hfal-test.h"
 #include "hfal-performance.h"
 #include "shavs.h"
-#include "cli.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* algo_name = "JH";
+char *algo_name = "JH";
 
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
 	(hfdesc_t*)&jh224_desc,
 	(hfdesc_t*)&jh256_desc,
 	(hfdesc_t*)&jh384_desc,
@@ -88,7 +80,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_jh},
 	{ performance_str,     NULL, performance_jh},
 	{ test256_str,         NULL, test256Null},
@@ -101,21 +93,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_algolist=(hfdesc_t**)algolist;
 	shavs_algo=(hfdesc_t*)&jh256_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);
 	}
 }