+Shabal

[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 90c5971abd1597de3c1e464ebc62d6fe979cd29b..be4f69271d15ef3c1d2fc0937c73293d0cce761a 100644 (file)
--- a/test_src/main-md5-test.c
+++ b/test_src/main-md5-test.c
@@ -40,13 +40,6 @@ char* algo_name = "MD5";
 /*****************************************************************************
  *  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 +52,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 +88,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]);
@@ -131,27 +124,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"));
 }
 
 
@@ -174,13 +167,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 int main (void){
        DEBUG_INIT();
-       uart_putstr("\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"));
+               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);
        }
 }