fixing E-Mail-Address & Copyright

[avr-crypto-lib.git] / test_src / main-whirlpool-t-test.c

diff --git a/test_src/main-whirlpool-t-test.c b/test_src/main-whirlpool-t-test.c
index c5475fae7426cb168887fb51cf0618a14877f9e2..cc5fd3f9305c8461553e80fa4fb8fcd3bf6e80b6 100644 (file)
--- a/test_src/main-whirlpool-t-test.c
+++ b/test_src/main-whirlpool-t-test.c
@@ -1,7 +1,7 @@
 /* main-whirlpool-t-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,8 @@
  *
 */
 
-#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 +30,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_t.h"
 #include "dump.h"
 
-char* algo_name = "Whirlpool-T";
+char *algo_name = "Whirlpool-T";
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t *const algolist[] PROGMEM = {
        (hfdesc_t*)&whirlpool_t_desc,
        NULL
 };
@@ -140,7 +134,7 @@ 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              },
@@ -156,16 +150,13 @@ 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_t_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);
        }
 }