X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-blake-test.c;h=3efab31f4e66c40bbc4cfb5ac52f620336e702d4;hp=ea7e7c8ad9a21b6bff1a88b8a814451d516414be;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=22b608111d32de8b0c8fa34f35bd0d8892df2285

diff --git a/test_src/main-blake-test.c b/test_src/main-blake-test.c
index ea7e7c8..3efab31 100644
--- a/test_src/main-blake-test.c
+++ b/test_src/main-blake-test.c
@@ -1,7 +1,7 @@
 /* main-blake-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,10 +21,7 @@
  *
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "blake_small.h"
 #include "blake_large.h"
@@ -34,18 +31,12 @@
 #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 = "Blake";
+char *algo_name = "Blake";
 
-
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
 	(hfdesc_t*)&blake224_desc,
 	(hfdesc_t*)&blake256_desc,
 	(hfdesc_t*)&blake384_desc,
@@ -60,19 +51,19 @@ const hfdesc_t* algolist[] PROGMEM = {
 void testrun_nessie_blake(void){
 	hfal_nessie_multiple(algolist);
 }
-void blake224_test(void* msg, uint32_t length_b){
+void blake224_test(void *msg, uint32_t length_b){
 	hfal_test(&blake224_desc, msg, length_b);
 }
 
-void blake256_test(void* msg, uint32_t length_b){
+void blake256_test(void *msg, uint32_t length_b){
 	hfal_test(&blake256_desc, msg, length_b);
 }
 
-void blake384_test(void* msg, uint32_t length_b){
+void blake384_test(void *msg, uint32_t length_b){
 	hfal_test(&blake384_desc, msg, length_b);
 }
 
-void blake512_test(void* msg, uint32_t length_b){
+void blake512_test(void *msg, uint32_t length_b){
 	hfal_test(&blake512_desc, msg, length_b);
 }
 void testrun_stdtest_blake(void){
@@ -133,7 +124,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_blake},
 	{ test_str,            NULL, testrun_stdtest_blake},
 	{ testshort_str,       NULL, testshort},
@@ -149,21 +140,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*)&blake256_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);
 	}
 }