X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-echo-test.c;h=49efba890d2bec24ef6b636a062b95a2a1c15a05;hp=073cdd0a6690b57b9c80bc19f59d3df282b113d1;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8

diff --git a/test_src/main-echo-test.c b/test_src/main-echo-test.c
index 073cdd0..49efba8 100644
--- a/test_src/main-echo-test.c
+++ b/test_src/main-echo-test.c
@@ -1,7 +1,7 @@
 /* main-echo-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  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,28 +21,21 @@
  *
 */
 
-#include "config.h"
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "echo.h"
-#include "cli.h"
-#include "hfal/hfal_echo.h"
+#include "hfal_echo.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+char *algo_name = "Echo";
 
-char* algo_name = "CubeHash";
 
-
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
 	(hfdesc_t*)&echo224_desc,
 	(hfdesc_t*)&echo256_desc,
 	(hfdesc_t*)&echo384_desc,
@@ -54,7 +47,7 @@ const hfdesc_t* algolist[] PROGMEM = {
  *  additional validation-functions											 *
  *****************************************************************************/
 /* IntermediateKAT1_256.txt */
-uint8_t intermediate_data[] PROGMEM = {
+const uint8_t intermediate_data[] PROGMEM = {
 	0xDB, 0x11, 0xF6, 0x09, 0xBA, 0xBA, 0x7B, 0x0C,
 	0xA6, 0x34, 0x92, 0x6B, 0x1D, 0xD5, 0x39, 0xC8,
 	0xCB, 0xAD, 0xA2, 0x49, 0x67, 0xD7, 0xAD, 0xD4,
@@ -79,7 +72,7 @@ uint8_t intermediate_data[] PROGMEM = {
 	0xFD, 0x29, 0xD1, 0x04, 0xCE
 	};
 
-uint8_t intermediate_data2[] PROGMEM = {
+const uint8_t intermediate_data2[] PROGMEM = {
 	0x75, 0x8E, 0xA3, 0xFE, 0xA7, 0x38, 0x97, 0x3D,
 	0xB0, 0xB8, 0xBE, 0x7E, 0x59, 0x9B, 0xBE, 0xF4,
 	0x51, 0x93, 0x73, 0xD6, 0xE6, 0xDC, 0xD7, 0x19,
@@ -158,7 +151,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_echo         },
 	{ interm_str,                NULL, echo256_interm              },
 	{ interm2_str,               NULL, echo512_interm              },
@@ -173,20 +166,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*)&echo256_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);
 	}