X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-jh-test.c;h=a54e913a21d1e6d61f554c9ab5ae4f62ffa66749;hb=22985930c9c2c610ae18e2d8df0f3ea78a082134;hp=48f41dc86d06fc2fd32a1e0196e70a9ecd3ed2b1;hpb=bd740a03aa9137d46277a2eee05ac6be538ef69d;p=avr-crypto-lib.git

diff --git a/test_src/main-jh-test.c b/test_src/main-jh-test.c
index 48f41dc..a54e913 100644
--- a/test_src/main-jh-test.c
+++ b/test_src/main-jh-test.c
@@ -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,
@@ -73,18 +65,6 @@ void test256Null(void){
 	cli_hexdump_block(hash, 32, 4, 8);
 }
 
-
-void singleround_jh(void){
-	uint8_t data[] = {
-		0x1,0,0,0,0,0,0,0x0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-		0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
-	jh_encrypt(data);
-	cli_putstr_P(PSTR("\r\nresult:\r\n"));
-	cli_hexdump_block(data, 128, 4, 16);
-}
-
 /*****************************************************************************
  *  main																	 *
  *****************************************************************************/
@@ -100,11 +80,11 @@ 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},
-	{ singleround_str,     NULL, singleround_jh},
+//	{ singleround_str,     NULL, singleround_jh},
 	{ shavs_list_str,      NULL, shavs_listalgos},
 	{ shavs_set_str,   (void*)1, (void_fpt)shavs_setalgo},
 	{ shavs_test1_str,     NULL, shavs_test1},
@@ -113,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);
 	}
 }