camellia seems broken

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

diff --git a/main-md5-test.c b/main-md5-test.c
index 3ed1a1a5d1c4670ffad60ff8b6d29a913b475c7d..490ee480a030bbc9ad2b4570b7c1cf681f4c6a27 100644 (file)
--- a/main-md5-test.c
+++ b/main-md5-test.c
@@ -27,14 +27,44 @@
 #include "debug.h"
 
 #include "md5.h"
+#include "nessie_hash_test.h"
+#include "performance_test.h"
 
 #include <stdint.h>
 #include <string.h>
+#include <stdlib.h>
+#include "cli.h"
 
+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);
+}
+
+
+void testrun_nessie_md5(void){
+       nessie_hash_ctx.hashsize_b  = 128;
+       nessie_hash_ctx.blocksize_B = 512/8;
+       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_conv = (nessie_hash_conv_fpt)md5_ctx2hash_dummy;
+       
+       nessie_hash_run();
+}
 
 /*****************************************************************************
  *  self tests                                                                                                                          *
@@ -72,6 +102,43 @@ 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"));
+}
+
 
 /*****************************************************************************
  *  main                                                                                                                                        *
@@ -85,15 +152,17 @@ int main (void){
        uart_putstr("\r\n");
 
        uart_putstr("\r\n\r\nCrypto-VS (MD5)\r\nloaded and running\r\n");
-restart:
+       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 (strcmp(str, "test")) {DEBUG_S("DBG: 1b\r\n"); goto error;}
-                       testrun_md5();
-               goto restart;           
+               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");
-       } /* while (1) */
+       }
 }