fixing E-Mail-Address & Copyright

[avr-crypto-lib.git] / test_src / main-mqq160-sign-test.c

diff --git a/test_src/main-mqq160-sign-test.c b/test_src/main-mqq160-sign-test.c
index a5d3f1c67883a030a87593bf291d61c6833462f1..4b03ba11267eaea4bea3f118572a0ee06fc98d17 100644 (file)
--- a/test_src/main-mqq160-sign-test.c
+++ b/test_src/main-mqq160-sign-test.c
@@ -1,7 +1,7 @@
 /* main-mqq160-sign-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2010 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 "cli.h"
 #include "mqq160-sign.h"
 #include "mqq160-sign_P.h"
 #include "mqq160-sign_testkey.h"
 #include "performance_test.h"
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <avr/pgmspace.h>
 #include "stack_measuring.h"
 
-char* algo_name = "MQQ160-sign";
+char *algo_name = "MQQ160-sign";
 
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
-uint8_t test_hash[20] PROGMEM =
+const uint8_t test_hash[20] PROGMEM =
 {
        (uint8_t)0x64, (uint8_t)0xFE, (uint8_t)0x2A, (uint8_t)0x85,
        (uint8_t)0xBB, (uint8_t)0x8C, (uint8_t)0x54, (uint8_t)0x5C,
@@ -176,7 +169,7 @@ const char test_mem_str[]    PROGMEM = "mem";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { test_str,                    NULL, testrun_mqq                   },
        { test_flash_str,              NULL, testrun_mqq_flash             },
        { test_mem_str,                NULL, testrun_mqq_mem               },
@@ -186,19 +179,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-       DEBUG_INIT();
-
-       cli_rx = (cli_rx_fpt)uart0_getc;
-       cli_tx = (cli_tx_fpt)uart0_putc;
-       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"));
+    main_setup();
 
+    for(;;){
+        welcome_msg(algo_name);
                cmd_interface(cmdlist);
        }
 }