new cli system

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

diff --git a/test_src/main-md5-test.c b/test_src/main-md5-test.c
index 490ee480a030bbc9ad2b4570b7c1cf681f4c6a27..1ede35338319125983d2082df984b882abbb67ca 100644 (file)
--- a/test_src/main-md5-test.c
+++ b/test_src/main-md5-test.c
@@ -1,6 +1,6 @@
 /* main-md5-test.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-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
@@ -84,8 +84,13 @@ void testrun_nessie_md5(void){
  */
 
 void testrun_md5(void){
-       md5_ctx_t s;
-       char* testv[]={"", "a", "abc", "message digest", "abcdefghijklmnopqrstuvwxyz", 
+       md5_hash_t hash;
+       char* testv[]={
+               "", 
+               "a", 
+               "abc", 
+               "message digest", 
+               "abcdefghijklmnopqrstuvwxyz", 
                "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 
                "12345678901234567890123456789012345678901234567890123456789012345678901234567890"};
        uint8_t i;
@@ -94,10 +99,9 @@ void testrun_md5(void){
        for(i=0; i<7; ++i){
                uart_putstr("\r\n MD5 (\"");
                uart_putstr(testv[i]);
-               uart_putstr("\") = \r\n");
-               md5_init(&s);
-               md5_lastBlock(&s, testv[i], strlen(testv[i])*8);
-               uart_hexdump(&s.a[0], 16);
+               uart_putstr("\") = \r\n\t");
+               md5(&hash, testv[i], strlen(testv[i])*8);
+               uart_hexdump(hash, 16);
        }
 }
 
@@ -141,28 +145,31 @@ void testrun_performance_md5(void){
 
 
 /*****************************************************************************
- *  main                                                                                                                                        *
+ * main                                                                                                                                         *
  *****************************************************************************/
 
-int main (void){
-       char str[20];
+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_md5},
+       { test_str,        NULL, testrun_md5},
+       { performance_str, NULL, testrun_performance_md5},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { NULL,            NULL, NULL}
+};
+
+int main (void){
        DEBUG_INIT();
        uart_putstr("\r\n");
-
-       uart_putstr("\r\n\r\nCrypto-VS (MD5)\r\nloaded and running\r\n");
-       PGM_P    u   = PSTR("nessie\0test\0performance\0");
-       void_fpt v[] = {testrun_nessie_md5, testrun_md5, testrun_performance_md5};
-
-       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);
        }
 }
-