new cli system

[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 ecb9ad2f45a11b5750a1d5ef281131a207f1985b..47ed45972a6d646f8d147156aec7c5a83a5805cf 100644 (file)
--- a/test_src/main-aes-test.c
+++ b/test_src/main-aes-test.c
@@ -1,6 +1,6 @@
 /* main-aes-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
@@ -42,8 +42,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <avr/pgmspace.h>
 
-char* cipher_name = "AES";
+char* algo_name = "AES";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -52,7 +53,7 @@ char* cipher_name = "AES";
 void testrun_nessie_aes(void){
        nessie_bc_ctx.blocksize_B =  16;
        nessie_bc_ctx.keysize_b   = 128;
-       nessie_bc_ctx.name        = cipher_name;
+       nessie_bc_ctx.name        = algo_name;
        nessie_bc_ctx.ctx_size_B  = sizeof(aes128_ctx_t);
        nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)aes128_enc;
        nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)aes128_dec;
@@ -299,30 +300,32 @@ void testrun_performance_aes(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";
+
+cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_aes },
+       { test_str,        NULL, testrun_test_aes},
+       { testkey_str,     NULL, testrun_testkey_aes},
+       { performance_str, NULL, testrun_performance_aes},
+       { 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\0testkey\0performance\0");
-       void_fpt v[] = {testrun_nessie_aes, 
-                       testrun_test_aes, 
-                       testrun_testkey_aes, 
-                       testrun_performance_aes};
-
-       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);
        }
-       
 }