X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-rc6-test.c;h=aa1d897a50dc75a214a8bdf6a69abd7ce7cf35d6;hb=7f4bda01ca923c4a9aca6da3370a7c4793426a5c;hp=5e3dfef9d120aa7ecd7673c9a79415040fdfa942;hpb=17332291e15183d71d88ed868275e3cb53917180;p=avr-crypto-lib.git

diff --git a/test_src/main-rc6-test.c b/test_src/main-rc6-test.c
index 5e3dfef..aa1d897 100644
--- 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 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
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
- * rc5 test-suit
+ * rc6 test-suit
  * 
 */
 
@@ -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																	 *
  *****************************************************************************/
 
-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"));
+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}
+};
 
-	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");
-	}
+int main (void){
+	DEBUG_INIT();
 	
+	cli_rx = uart_getc;
+	cli_tx = uart_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);
+	}
 }
-