fixing E-Mail-Address & Copyright

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

diff --git a/test_src/main-aes-test.c b/test_src/main-aes-test.c
index e7b20713430094a63bd26d6bd27606d2560b50cc..6b20c582d244263fe3dab918d51cd1858b298fce 100644 (file)
--- a/test_src/main-aes-test.c
+++ b/test_src/main-aes-test.c
@@ -1,7 +1,7 @@
 /* main-aes-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  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,15 +20,9 @@
  * AES test-suit
  *
 */
-
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
-
+#include "main-test-common.h"
 #include "aes.h"
 
-#include "cli.h"
 #include "performance_test.h"
 #include "dump.h"
 
@@ -46,14 +40,9 @@
 #include "bcal-performance.h"
 #include "bcal-nessie.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include <avr/pgmspace.h>
-
-const char* algo_name = "AES";
+const char *algo_name = "AES";
 
-const bcdesc_t* const const algolist[] PROGMEM = {
+const bcdesc_t *const const algolist[] PROGMEM = {
        (bcdesc_t*)&aes128_desc,
        (bcdesc_t*)&aes192_desc,
        (bcdesc_t*)&aes256_desc,
@@ -703,19 +692,16 @@ const const cmdlist_entry_t cmdlist[] PROGMEM = {
        { NULL,                NULL, NULL                            }
 };
 
+int main(void) {
+       main_setup();
 
-int main (void){
-       DEBUG_INIT();
-
-       cli_rx = (cli_rx_fpt)uart0_getc;
-       cli_tx = (cli_tx_fpt)uart0_putc;
        cmacvs_algolist=(bcdesc_t**)algolist;
        cmacvs_algo=(bcdesc_t*)&aes128_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"));
+               welcome_msg(algo_name);
                cmd_interface(cmdlist);
-       }
+    }
+
 }