big bug fixed, still some problems with flow control

[avr-crypto-lib.git] / test_src / main-md5-test.c

diff --git a/test_src/main-md5-test.c b/test_src/main-md5-test.c
index ec51e7d9adaf02b703c85664fa402b4aa757ce3d..fdafb204e517b27992cf805a034dfe9fe62c872c 100644 (file)
--- a/test_src/main-md5-test.c
+++ b/test_src/main-md5-test.c
@@ -23,12 +23,14 @@
 
 #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* 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();
@@ -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();
-       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-       
-       
-       startTimer(1);
-       md5_nextBlock(&ctx, data);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tone-block time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-       
-       
-       startTimer(1);
-       md5_lastBlock(&ctx, data, 0);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tlast block time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-       
-       cli_putstr_P(PSTR("\r\n"));
+       hfal_performance_multiple(algolist);
 }
 
 
@@ -175,8 +142,9 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 int main (void){
        DEBUG_INIT();
        
-       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(;;){
                cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
                cli_putstr(algo_name);