X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-md5-test.c;h=47730cd71a0e1dd0125a1479b1752fd834d15970;hb=b97b5aeaa3569443d9b95a77a388c6615b33f9e3;hp=90c5971abd1597de3c1e464ebc62d6fe979cd29b;hpb=fa7a41a129697b6e7dce363060d2265f5fdb93a6;p=avr-crypto-lib.git

diff --git a/test_src/main-md5-test.c b/test_src/main-md5-test.c
index 90c5971..47730cd 100644
--- a/test_src/main-md5-test.c
+++ b/test_src/main-md5-test.c
@@ -22,13 +22,15 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.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>
@@ -37,16 +39,14 @@
 
 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){
 	memcpy(buffer, ctx, 16);
@@ -59,8 +59,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();
@@ -95,7 +95,7 @@ void testrun_md5(void){
 		"12345678901234567890123456789012345678901234567890123456789012345678901234567890"};
 	uint16_t i;
 	
-	uart_putstr("\r\n=== MD5 test suit ===");
+	cli_putstr("\r\n=== MD5 test suit ===");
 	for(i=0; i<7; ++i){
 		cli_putstr("\r\n MD5 (\"");
 		cli_putstr(testv[i]);
@@ -118,40 +118,7 @@ void testrun_md5(void){
 
 
 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);
 }
 
 
@@ -164,7 +131,7 @@ const char test_str[]        PROGMEM = "test";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,      NULL, testrun_nessie_md5},
 	{ test_str,        NULL, testrun_md5},
 	{ performance_str, NULL, testrun_performance_md5},
@@ -174,13 +141,14 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 int main (void){
 	DEBUG_INIT();
-	uart_putstr("\r\n");
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+	
+	cli_rx = (cli_rx_fpt)uart0_getc;
+	cli_tx = (cli_tx_fpt)uart0_putc;	 	
+	testrun_md5();
 	for(;;){
-		uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		uart_putstr(algo_name);
-		uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+		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);
 	}
 }