fixing E-Mail-Address & Copyright

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

diff --git a/test_src/main-a5_1-test.c b/test_src/main-a5_1-test.c
index 98d63fa6f3edcb4bfc3a12326cf801b3426bdebc..75f06a248905900cf8bfca9cc44446fc813ac230 100644 (file)
--- a/test_src/main-a5_1-test.c
+++ b/test_src/main-a5_1-test.c
@@ -1,7 +1,7 @@
 /* main-a5_1-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
@@ -21,24 +21,17 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
-#include <A5_1.h>
+#include "A5_1.h"
 #include "nessie_stream_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include "cli.h"
-
-char* algo_name = "A5_1";
+char *algo_name = "A5_1";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
-void a51_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
+void a51_genctx_dummy(uint8_t *key, uint16_t keysize, void *ctx){
        a5_1_init(ctx,key, keysize, NULL, 0);
 }
 
@@ -68,7 +61,7 @@ const char testkey_str[]     PROGMEM = "testkey";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,      NULL, testrun_nessie_a51, NULL},
 /*     { performance_str, NULL, testrun_performance_a51, NULL}, */
        { echo_str,    (void*)1, (void_fpt)echo_ctrl, NULL},
@@ -76,16 +69,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-       DEBUG_INIT();
-       uart_putstr("\r\n");
-       
-       cli_rx = uart_getc;
-       cli_tx = uart_putc;             
+    main_setup();
        for(;;){
-               uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-               uart_putstr(algo_name);
-               uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-               cmd_interface(cmdlist);
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
        }
        
 }