fixing E-Mail-Address & Copyright

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

diff --git a/test_src/main-base64-test.c b/test_src/main-base64-test.c
index caf60fa4723864f485add9cea8836a7e3795e684..db2d41b6a0a1a5acbe610900bd28a526a521ccc1 100644 (file)
--- a/test_src/main-base64-test.c
+++ b/test_src/main-base64-test.c
@@ -1,7 +1,7 @@
 /* main-base64-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008, 2009  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,24 +21,16 @@
  * 
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "noekeon.h"
 #include "noekeon_prng.h"
 #include "base64_enc.h"
 #include "base64_dec.h"
 
-#include "cli.h"
 #include "performance_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* algo_name = "Base64";
+char *algo_name = "Base64";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -144,7 +136,7 @@ const char test_str[]        PROGMEM = "test";
 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_stdtest_base64},
        { performance_str, NULL, testrun_performance_base64},
        { echo_str,    (void*)1, (void_fpt)echo_ctrl},
@@ -152,14 +144,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;                
+    main_setup();
+
        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);
        }
 }