X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-whirlpool-test.c;h=b2bbff6695717867c64f904e9aee701338927be3;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hp=b1dab2f34b02bf41f0b4a73f848d66925bd81433;hpb=1de7784dc5fe0e2ebac23c0ee883a38f65a96b62;p=avr-crypto-lib.git

diff --git a/test_src/main-whirlpool-test.c b/test_src/main-whirlpool-test.c
index b1dab2f..b2bbff6 100644
--- a/test_src/main-whirlpool-test.c
+++ b/test_src/main-whirlpool-test.c
@@ -1,7 +1,7 @@
 /* main-whirlpool-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2011  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 "whirlpool.h"
 #include "nessie_hash_test.h"
@@ -32,17 +29,13 @@
 #include "hfal-performance.h"
 #include "hfal-nessie.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include "cli.h"
 #include "shavs.h"
 #include "hfal_whirlpool.h"
 #include "dump.h"
 
-char* algo_name = "Whirlpool";
+char *algo_name = "Whirlpool";
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
 	(hfdesc_t*)&whirlpool_desc,
 	NULL
 };
@@ -74,18 +67,6 @@ void testrun_performance_whirlpool(void){
 	hfal_performance_multiple(algolist);
 }
 
-void test_sbox(void){
-	uint8_t i=0;
-	cli_putstr_P(PSTR("\r\nWhirlpool S-Box:"));
-	do{
-		if(i%16==0){
-			cli_putstr_P(PSTR("\r\n\t"));
-		}
-		cli_hexdump_byte(whirlpool_sbox(i++));
-		cli_putc(' ');
-	}while(i);
-}
-
 void testrun_nessie2(void){
 	uint16_t i;
 	uint8_t j;
@@ -143,7 +124,6 @@ void testrun_nessie2(void){
 const char nessie_str[]      PROGMEM = "nessie";
 const char nessie2_str[]     PROGMEM = "nessie2";
 const char test_str[]        PROGMEM = "test";
-const char test_sbox_str[]   PROGMEM = "test_sbox";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 const char shavs_list_str[]  PROGMEM = "shavs_list";
@@ -153,11 +133,10 @@ const char shavs_test2_str[] PROGMEM = "shavs_test2";
 const char shavs_test3_str[] PROGMEM = "shavs_test3";
 const char dump_str[]        PROGMEM = "dump";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,          NULL, testrun_nessie_whirlpool       },
 	{ nessie2_str,         NULL, testrun_nessie2                },
 	{ test_str,            NULL, testrun_whirlpool              },
-	{ test_sbox_str,       NULL, test_sbox                      },
 	{ performance_str,     NULL, testrun_performance_whirlpool  },
 	{ echo_str,        (void*)1, (void_fpt)echo_ctrl            },
 	{ shavs_list_str,      NULL, shavs_listalgos                },
@@ -170,16 +149,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*)&whirlpool_desc;
 	for(;;){
-		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		cli_putstr(algo_name);
-		cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-		cmd_interface(cmdlist);
+	    welcome_msg(algo_name);
+	    cmd_interface(cmdlist);
 	}
 }