fixing bug in SHA1-C

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

diff --git a/test_src/main-rc6-test.c b/test_src/main-rc6-test.c
index 5d7ecdac07e4f607b026134b7574da9ecbb364a3..c3bb0f029789fb855157c2cd8de6adb460234069 100644 (file)
--- a/test_src/main-rc6-test.c
+++ b/test_src/main-rc6-test.c
@@ -1,6 +1,6 @@
 /* main-rc6-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
@@ -17,13 +17,13 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
- * rc5 test-suit
+ * rc6 test-suit
  * 
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "rc6.h"
@@ -36,7 +36,7 @@
 #include <stdlib.h>
 
 #define RC6_ROUNDS 20
-char* cipher_name = "RC6-32/20/16";
+char* algo_name = "RC6-32/20/16";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -49,7 +49,7 @@ void testrun_nessie_rc6(void){
        nessie_bc_init();
        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(rc6_ctx_t);
        nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)rc6_enc;
        nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)rc6_dec;
@@ -82,57 +82,58 @@ void testrun_performance_rc6(void){
        startTimer(1);
        rc6_init(key, 128, &ctx);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
+       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);       
+       cli_putstr(str);        
        
        startTimer(1);
        rc6_enc(data, &ctx);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tencrypt time: "));
+       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
+       cli_putstr(str);
        
        startTimer(1);
        rc6_dec(data, &ctx);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
+       cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
+       cli_putstr(str);
 
        startTimer(1);
        rc6_free(&ctx);
        t = stopTimer();
-       uart_putstr_P(PSTR("\r\n\tfree time: "));
+       cli_putstr_P(PSTR("\r\n\tfree time: "));
        ultoa((unsigned long)t, str, 10);
-       uart_putstr(str);
-       uart_putstr_P(PSTR("\r\n"));
+       cli_putstr(str);
+       cli_putstr_P(PSTR("\r\n"));
 }
 /*****************************************************************************
  *  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_rc6},
+       { test_str,        NULL, testrun_nessie_rc6},
+       { performance_str, NULL, testrun_performance_rc6},
+       { 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_rc6, testrun_nessie_rc6, testrun_performance_rc6};
-
-       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 = (cli_rx_fpt)uart0_getc;
+       cli_tx = (cli_tx_fpt)uart0_putc;                
+       for(;;){
+               cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
+               cli_putstr(algo_name);
+               cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+               cmd_interface(cmdlist);
+       }
 }
-