fixing E-Mail-Address & Copyright

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

diff --git a/test_src/main-entropium-test.c b/test_src/main-entropium-test.c
index df0bc744e9c9bf01d5cf1a16b05d8bd62d3a9938..f73c07104038dabccdc83e36dfb823fd58ec586c 100644 (file)
--- a/test_src/main-entropium-test.c
+++ b/test_src/main-entropium-test.c
@@ -1,7 +1,7 @@
 /* main-entropium-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,21 +21,13 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "entropium.h"
 #include "nessie_bc_test.h"
-#include "cli.h"
 #include "performance_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* cipher_name = "Entropium";
+char *algo_name = "Entropium";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -45,19 +37,19 @@ void testrun_entropium(void){
        char c, str[16];
        uint8_t data[32];
        uint32_t i=0;
-       while(!uart_getc_nb(&c)){
+       while('q'!=cli_getc()){
                entropium_getRandomBlock(data);
-               uart_putstr_P(PSTR("\r\n "));
+               cli_putstr_P(PSTR("\r\n "));
                ultoa(i, str, 10);
                for(c=strlen(str); c<11; ++c){
-                       uart_putc(' ');
+                       cli_putc(' ');
                }
-               uart_putstr(str);
+               cli_putstr(str);
                ++i;
-               uart_putstr_P(PSTR(" : "));
-               uart_hexdump(data, 32);
+               cli_putstr_P(PSTR(" : "));
+               cli_hexdump(data, 32);
        }
-       uart_putstr_P(PSTR("\r\n\r\n"));
+       cli_putstr_P(PSTR("\r\n\r\n"));
 }
 
 
@@ -72,45 +64,43 @@ void testrun_performance_entropium(void){
        startTimer(1);
        entropium_addEntropy(128, data);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tadd entropy time: "));
+       cli_putstr_P(PSTR("\r\n\tadd entropy time: "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
+       cli_putstr(str);
        
        
        startTimer(1);
        entropium_getRandomBlock(data);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tget random time:  "));
+       cli_putstr_P(PSTR("\r\n\tget random time:  "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
+       cli_putstr(str);
        
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr_P(PSTR("\r\n"));
 }
 /*****************************************************************************
  *  main                                                                                                                                        *
  *****************************************************************************/
 
-int main (void){
-       char  str[20];
-       DEBUG_INIT();
-       uart_putstr("\r\n");
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
 
-       uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-       uart_putstr(cipher_name);
-       uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+const cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_entropium},
+       { test_str,        NULL, testrun_entropium},
+       { performance_str, NULL, testrun_performance_entropium},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { NULL,            NULL, NULL}
+};
+ 
 
-       PGM_P    u   = PSTR("nessie\0test\0performance\0");
-       void_fpt v[] = {testrun_entropium, testrun_entropium, testrun_performance_entropium};
+int main (void){
+    main_setup();
 
-       while(1){ 
-               if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}
-               if(execcommand_d0_P(str, u, v)<0){
-                       uart_putstr_P(PSTR("\r\nunknown command\r\n"));
-               }
-               continue;
-       error:
-               uart_putstr("ERROR\r\n");
+       for(;;){
+           welcome_msg(algo_name);
+           cmd_interface(cmdlist);
        }
-       
 }
-