X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-sha1-test.c;h=e8ef85f7d54d6a069cdcc1b88723fd8bbeb367af;hb=32e8c149a5d05724c3cf32a9ec9b795ac9e87be3;hp=6f07227c03722943f459967fc6c6eae9dbb4e8ff;hpb=2159c273c9d3361571a6ff1ab63d9bc76582fbab;p=avr-crypto-lib.git

diff --git a/test_src/main-sha1-test.c b/test_src/main-sha1-test.c
index 6f07227..e8ef85f 100644
--- a/test_src/main-sha1-test.c
+++ b/test_src/main-sha1-test.c
@@ -1,6 +1,6 @@
 /* main-sha1-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
@@ -104,6 +104,24 @@ void testrun_sha1(void){
 	uart_putstr("\r\nx");
 }
 
+
+void testrun_sha1_2(void){
+	sha1_ctx_t ctx;
+	sha1_hash_t hash;
+	sha1(&hash,"",0);
+	uart_putstr("\r\nsha1(NULL) = \r\n\t");
+	uart_hexdump(hash,SHA1_HASH_BYTES);
+
+	memset(hash, 0, SHA1_HASH_BYTES);
+
+	sha1_init(&ctx);
+	sha1_lastBlock(&ctx, "", 0);
+	sha1_ctx2hash(hash, &ctx); 
+	uart_putstr("\r\nsha1(NULL) = \r\n\t");
+	uart_hexdump(hash,SHA1_HASH_BYTES);
+}
+
+
 void testrun_performance_sha1(void){
 	uint64_t t;
 	char str[16];
@@ -146,26 +164,30 @@ void testrun_performance_sha1(void){
  *  main																	 *
  *****************************************************************************/
 
-int main (void){
-	char str[20];
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char test2_str[]       PROGMEM = "test2";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
+
+cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,      NULL, testrun_nessie_sha1},
+	{ test_str,        NULL, testrun_sha1},
+	{ test2_str,       NULL, testrun_sha1_2},
+	{ performance_str, NULL, testrun_performance_sha1},
+	{ 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 (SHA-1)\r\nloaded and running\r\n");
-
-	PGM_P    u   = PSTR("nessie\0test\0performance\0");
-	void_fpt v[] = {testrun_nessie_sha1, testrun_sha1, testrun_performance_sha1};
-
-	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(;;){
+		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);
 	}
 }
-
-