new cli system

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

diff --git a/test_src/main-grain-test.c b/test_src/main-grain-test.c
index d09e0024d53a57d32a37cba70bbcb4628e1ec08e..036faad94490a06930f813491e2da0f7a57eaaf1 100644 (file)
--- a/test_src/main-grain-test.c
+++ b/test_src/main-grain-test.c
@@ -1,6 +1,6 @@
 /* main-grain-test.c */
 /*
-    This file is part of the This file is part of the AVR-Crypto-Lib.
+    This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -35,7 +35,7 @@
 #include <stdint.h>
 #include <string.h>
 
-char* cipher_name = "Grain";
+char* algo_name = "Grain";
 
 /*****************************************************************************
  *  additional validation-functions                                          *
@@ -67,7 +67,7 @@ void testrun_nessie_grain(void){
        nessie_stream_ctx.outsize_b =   8; /* actually unused */
        nessie_stream_ctx.keysize_b =  80; /* this is the one we have refrence vectors for */
        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(grain_ctx_t);
        nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)grain_genctx_dummy;
        nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)grain_getbyte_dummy_rev;
@@ -153,28 +153,28 @@ void testrun_performance_grain(void){
  *  main                                                                     *
  *****************************************************************************/
 
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
+
+cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_grain },
+       { test_str,        NULL, testrun_std_grain},
+       { performance_str, NULL, testrun_performance_grain},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { 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"));
-
-       PGM_P    u   = PSTR("nessie\0test\0performance\0");
-       void_fpt v[] = {testrun_nessie_grain, testrun_std_grain, testrun_performance_grain};
-
-       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");
-       }       
+       cli_rx = uart_getc;
+       cli_tx = uart_putc;             
+       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);
+       }
 }
-
-
-