X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-twister512-test.c;h=149abef17de2b2905ac1fab0613a0ae68e08a30a;hb=572b35bb7409fb362441e0812cb62eab9f2411f0;hp=22309d015e7e5d258115b2678785eefa3cafdf6f;hpb=0076b72ccd398bf7571c5144ba36eda8a24f6c70;p=avr-crypto-lib.git

diff --git a/test_src/main-twister512-test.c b/test_src/main-twister512-test.c
index 22309d0..149abef 100644
--- a/test_src/main-twister512-test.c
+++ b/test_src/main-twister512-test.c
@@ -1,6 +1,6 @@
 /* main-twister512-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
@@ -113,7 +113,8 @@ void testrun_twister512(void){
 		twister512(hash, &(stestv[i]), stestl[i]);
 		print_hash(hash);
 	}
-
+	
+#ifdef TWISTER_LONGTEST
 	uart_putstr_P(PSTR("\r\n\r\n=== TWISTER-512 test suit (long test) ==="));
 	char* ltest= "abcdefghbcdefghicdefghijdefghijk"
                            "efghijklfghijklmghijklmnhijklmno";	
@@ -127,6 +128,7 @@ void testrun_twister512(void){
 	}
 	twister512_ctx2hash(hash, &ctx);
 	print_hash(hash);
+#endif
 }
 
 
@@ -180,29 +182,28 @@ void testrun_performance_twister512(void){
  *
  *****************************************************************************/
 
-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";
 
-	
-	DEBUG_INIT();
-	uart_putstr_P(PSTR("\r\n"));
+cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,      NULL, testrun_nessie_twister512},
+	{ test_str,        NULL, testrun_twister512},
+	{ performance_str, NULL, testrun_performance_twister512},
+	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
+	{ NULL,            NULL, NULL}
+};
 
-	uart_putstr_P(PSTR("\r\n\r\nCrypto-VS (")); 
-	uart_putstr(algo_name);
-	uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-	PGM_P    u   = PSTR("nessie\0test\0performance\0");
-	void_fpt v[] = { testrun_nessie_twister512, 
-                         testrun_twister512, 
-                         testrun_performance_twister512 };
-
-	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();
+	uart_putstr("\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);
 	}
 }
-