X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-md5-test.c;h=e88a91a80fc589e424b0ec92debad6d639159aec;hp=1bc69fa9a2b6ee6c1b748fb449ca67523fb1a44c;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=a397db40b94b01a3ed72f9367961cf68d82593d1

diff --git a/test_src/main-md5-test.c b/test_src/main-md5-test.c
index 1bc69fa..e88a91a 100644
--- a/test_src/main-md5-test.c
+++ b/test_src/main-md5-test.c
@@ -1,7 +1,7 @@
 /* main-md5-test.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    This file is part of the AVR-Crypto-Lib.
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,34 +21,26 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "md5.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
+#include "hfal_md5.h"
+#include "hfal-performance.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-#include "cli.h"
+char *algo_name = "MD5";
 
-char* algo_name = "MD5";
+const hfdesc_t *const algolist[] PROGMEM = {
+	(hfdesc_t*)&md5_desc,
+	NULL
+};
 
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void md5_next_dummy(void* buffer, void* ctx){
-	md5_nextBlock(ctx, buffer);
-}
-
-void md5_last_dummy(void* buffer, uint16_t size_b, void* ctx){
-	md5_lastBlock(ctx, buffer, size_b);
-}
 
-void md5_ctx2hash_dummy(void* buffer, void* ctx){
+void md5_ctx2hash_dummy(void *buffer, void *ctx){
 	memcpy(buffer, ctx, 16);
 }
 
@@ -59,8 +51,8 @@ void testrun_nessie_md5(void){
 	nessie_hash_ctx.ctx_size_B  = sizeof(md5_ctx_t);
 	nessie_hash_ctx.name = algo_name;
 	nessie_hash_ctx.hash_init = (nessie_hash_init_fpt)md5_init;
-	nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)md5_next_dummy;
-	nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)md5_last_dummy;
+	nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)md5_nextBlock;
+	nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)md5_lastBlock;
 	nessie_hash_ctx.hash_conv = (nessie_hash_conv_fpt)md5_ctx2hash_dummy;
 	
 	nessie_hash_run();
@@ -85,7 +77,7 @@ void testrun_nessie_md5(void){
 
 void testrun_md5(void){
 	md5_hash_t hash;
-	char* testv[]={
+	char *testv[]={
 		"", 
 		"a", 
 		"abc", 
@@ -93,54 +85,32 @@ 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");
+		cli_putstr("\r\n MD5 (\"");
+		cli_putstr(testv[i]);
+		cli_putstr("\") = \r\n\t");
 		md5(&hash, testv[i], strlen(testv[i])*8);
-		uart_hexdump(hash, 16);
+		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);
 	}
 }
 
 
 void testrun_performance_md5(void){
-	uint64_t t;
-	char str[16];
-	uint8_t data[32];
-	md5_ctx_t ctx;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(data, 0, 32);
-	
-	startTimer(1);
-	md5_init(&ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	
-	startTimer(1);
-	md5_nextBlock(&ctx, data);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tone-block time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	
-	startTimer(1);
-	md5_lastBlock(&ctx, data, 0);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tlast block time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	uart_putstr_P(PSTR("\r\n"));
+	hfal_performance_multiple(algolist);
 }
 
 
@@ -148,25 +118,24 @@ void testrun_performance_md5(void){
  * main																	 *
  *****************************************************************************/
 
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
+
+const 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){
-	char str[20];
+    main_setup();
 
-	
-	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");
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
 }
-