fixing E-Mail-Address & Copyright

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

diff --git a/test_src/main-khazad-test.c b/test_src/main-khazad-test.c
index b5449fe8034f24d0e9ef0d37e58ea9f05d374df6..d0ccff8048c8041a02a92fab7c52f47904520b06 100644 (file)
--- a/test_src/main-khazad-test.c
+++ b/test_src/main-khazad-test.c
@@ -1,7 +1,7 @@
 /* main-khazad-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
@@ -20,26 +20,17 @@
  * khazad test-suit
  * 
 */
-
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "khazad.h"
-#include "cli.h"
 #include "performance_test.h"
 #include "bcal-performance.h"
 #include "bcal-nessie.h"
 #include "bcal_khazad.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
+char *algo_name = "Khazad";
 
-char* algo_name = "Khazad";
-
-const bcdesc_t* const algolist[] PROGMEM = {
+const bcdesc_t *const algolist[] PROGMEM = {
        (bcdesc_t*)&khazad_desc,
        NULL
 };
@@ -113,14 +104,10 @@ const 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(")\r\nloaded and running\r\n"));
-               cmd_interface(cmdlist);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
        }
 }