X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-md5-test.c;h=ec51e7d9adaf02b703c85664fa402b4aa757ce3d;hb=83d0614d8b17eac97f891f7de2bb3ef265751dea;hp=c3e40dae816ce44171c3ef7f509390bab2e9c094;hpb=5ac75cfae217122b540c1a6d258054230dc534c3;p=avr-crypto-lib.git

diff --git a/test_src/main-md5-test.c b/test_src/main-md5-test.c
index c3e40da..ec51e7d 100644
--- 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,7 +84,7 @@ void testrun_nessie_md5(void){
  */
 
 void testrun_md5(void){
-	md5_ctx_t s;
+	md5_hash_t hash;
 	char* testv[]={
 		"", 
 		"a", 
@@ -93,16 +93,26 @@ void testrun_md5(void){
 		"abcdefghijklmnopqrstuvwxyz", 
 		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", 
 		"12345678901234567890123456789012345678901234567890123456789012345678901234567890"};
-	uint8_t i;
+	uint16_t i;
 	
-	uart_putstr("\r\n=== MD5 test suit ===");
+	cli_putstr("\r\n=== MD5 test suit ===");
 	for(i=0; i<7; ++i){
-		uart_putstr("\r\n MD5 (\"");
-		uart_putstr(testv[i]);
-		uart_putstr("\") = \r\n\t");
-		md5_init(&s);
-		md5_lastBlock(&s, testv[i], strlen(testv[i])*8);
-		uart_hexdump(&(s.a[0]), 16);
+		cli_putstr("\r\n MD5 (\"");
+		cli_putstr(testv[i]);
+		cli_putstr("\") = \r\n\t");
+		md5(&hash, testv[i], strlen(testv[i])*8);
+		cli_hexdump(hash, 16);
+	}
+	uint8_t buffer[512/8];
+	char str[5];
+	for(i=505; i<512; ++i){
+		memset(buffer, 0, 512/8);
+		cli_putstr_P(PSTR("\r\nMD5("));
+		utoa(i, str, 10);
+		cli_putstr(str);
+		cli_putstr_P(PSTR(" zero bits) = "));
+		md5(&hash, buffer, i);
+		cli_hexdump(hash, 16);
 	}
 }
 
@@ -121,27 +131,27 @@ void testrun_performance_md5(void){
 	startTimer(1);
 	md5_init(&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);
 	md5_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);
 	md5_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);
 	
-	uart_putstr_P(PSTR("\r\n"));
+	cli_putstr_P(PSTR("\r\n"));
 }
 
 
@@ -149,25 +159,28 @@ void testrun_performance_md5(void){
  * 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(;;){
+		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);
 	}
 }
-