X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-twister512-test.c;h=8e54bac5965b5c0ce893852ac0554bd2eeabac96;hb=83d0614d8b17eac97f891f7de2bb3ef265751dea;hp=c9cc667e6b53733b192808876a406d2ddf664edb;hpb=288c82e97b3c37666b1c11475b45a956b3e5e8e0;p=avr-crypto-lib.git

diff --git a/test_src/main-twister512-test.c b/test_src/main-twister512-test.c
index c9cc667..8e54bac 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
@@ -75,9 +75,9 @@ void testrun_nessie_twister512(void){
  ******************************************************************************/
 
 void print_hash(void* hash){
-	uart_hexdump(hash, 256/8);
-	uart_putstr_P(PSTR("\r\n\t"));
-	uart_hexdump((uint8_t*)hash+256/8, 256/8);
+	cli_hexdump(hash, 256/8);
+	cli_putstr_P(PSTR("\r\n\t"));
+	cli_hexdump((uint8_t*)hash+256/8, 256/8);
 	
 }
 
@@ -93,36 +93,36 @@ void testrun_twister512(void){
 		"12345678901234567890123456789012345678901234567890123456789012345678901234567890"};
 	uint32_t i;
 	
-	uart_putstr_P(PSTR("\r\n=== TWISTER-512 test suit (MD5 test values) ==="));
+	cli_putstr_P(PSTR("\r\n=== TWISTER-512 test suit (MD5 test values) ==="));
 	for(i=0; i<7; ++i){
-		uart_putstr_P(PSTR("\r\n TWISTER-512 (\""));
-		uart_putstr(testv[i]);
-		uart_putstr_P(PSTR("\") = \r\n\t"));
+		cli_putstr_P(PSTR("\r\n TWISTER-512 (\""));
+		cli_putstr(testv[i]);
+		cli_putstr_P(PSTR("\") = \r\n\t"));
 		twister512(&hash, testv[i], strlen(testv[i])*8);
 		print_hash(hash);
 	//	return;
 	}
 	
-	uart_putstr_P(PSTR("\r\n\r\n=== TWISTER-512 test suit (short test values) ==="));
+	cli_putstr_P(PSTR("\r\n\r\n=== TWISTER-512 test suit (short test values) ==="));
 	uint8_t stestv[]= {0x00, 0x00, 0xC0, 0xC0, 0x80, 0x48, 0x50};
 	uint8_t stestl[]= {   0,    1,    2,    3,    4,    5,    6};	
 	for(i=0; i<7; ++i){
-		uart_putstr_P(PSTR("\r\n TWISTER-512 (\""));
-		uart_hexdump(&(stestv[i]), 1);
-		uart_putstr_P(PSTR("\") = \r\n\t"));
+		cli_putstr_P(PSTR("\r\n TWISTER-512 (\""));
+		cli_hexdump(&(stestv[i]), 1);
+		cli_putstr_P(PSTR("\") = \r\n\t"));
 		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) ==="));
+	cli_putstr_P(PSTR("\r\n\r\n=== TWISTER-512 test suit (long test) ==="));
 	char* ltest= "abcdefghbcdefghicdefghijdefghijk"
                            "efghijklfghijklmghijklmnhijklmno";	
 	twister512_ctx_t ctx;
 	twister512_init(&ctx);	
-	uart_putstr_P(PSTR("\r\n TWISTER-512 ( 16777216 x \""));
-	uart_putstr(ltest);	
-	uart_putstr_P(PSTR("\") = \r\n\t"));
+	cli_putstr_P(PSTR("\r\n TWISTER-512 ( 16777216 x \""));
+	cli_putstr(ltest);	
+	cli_putstr_P(PSTR("\") = \r\n\t"));
 	for(i=0; i<16777216; ++i){
 		twister512_nextBlock(&ctx, ltest);
 	}
@@ -146,34 +146,34 @@ void testrun_performance_twister512(void){
 	startTimer(1);
 	twister_big_init(&ctx, 512);
 	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);
 	twister_big_nextBlock(&ctx, data);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tone-block time: "));
+	cli_putstr_P(PSTR("\r\n\tone-block time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	cli_putstr(str);
 	
 	
 	startTimer(1);
 	twister_big_lastBlock(&ctx, data, 0);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tlast block time: "));
+	cli_putstr_P(PSTR("\r\n\tlast block time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	cli_putstr(str);
 	
 	startTimer(1);
 	twister_big_ctx2hash(data, &ctx, 512);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx2hash time: "));
+	cli_putstr_P(PSTR("\r\n\tctx2hash time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	cli_putstr(str);
 
-	uart_putstr_P(PSTR("\r\n"));
+	cli_putstr_P(PSTR("\r\n"));
 }
 
 
@@ -182,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";
 
-	
+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}
+};
+
+int main (void){
 	DEBUG_INIT();
-	uart_putstr_P(PSTR("\r\n"));
-
-	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");
+	
+	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);
 	}
 }
-