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 8b73b40279e51f4045029e822b50ad461b56006e..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 This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    This file is part of the AVR-Crypto-Lib.
+    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,23 +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>
-
-char* cipher_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);
 }
 
@@ -47,7 +41,7 @@ void testrun_nessie_a51(void){
        nessie_stream_ctx.outsize_b =   8; /* actually unused */
        nessie_stream_ctx.keysize_b =  64; 
        nessie_stream_ctx.ivsize_b =   64;
-       nessie_stream_ctx.name = cipher_name;
+       nessie_stream_ctx.name = algo_name;
        nessie_stream_ctx.ctx_size_B = sizeof(a5_1_ctx_t);
        nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)a51_genctx_dummy;
        nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)a5_1_gen;
@@ -61,26 +55,25 @@ void testrun_nessie_a51(void){
  *  main                                                                                                                                        *
  *****************************************************************************/
 
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char testkey_str[]     PROGMEM = "testkey";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
+
+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},
+       { NULL,            NULL, NULL, NULL}
+};
+
 int main (void){
-       char  str[20];
-       DEBUG_INIT();
-       uart_putstr("\r\n");
-
-       uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-       uart_putstr(cipher_name);
-       uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
-restart:
-       while(1){ 
-               if (!getnextwordn(str,20))  {DEBUG_S("DBG: W1\r\n"); goto error;}
-               if (strcmp(str, "nessie")) {DEBUG_S("DBG: 1b\r\n"); goto error;}
-                       testrun_nessie_a51();
-               goto restart;           
-               continue;
-       error:
-               uart_putstr("ERROR\r\n");
+    main_setup();
+       for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
        }
        
-       
 }