renaming to AVR-Crypto-Lib

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

diff --git a/test_src/main-arcfour-test.c b/test_src/main-arcfour-test.c
index 0e0be9181b9a986971ae360b5c516fff31b08d91..84fb9543e0bc61472bcc1678cadcb19de4139b85 100644 (file)
--- a/test_src/main-arcfour-test.c
+++ b/test_src/main-arcfour-test.c
@@ -1,6 +1,6 @@
 /* main-arcfour-test.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    This file is part of the This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -26,9 +26,12 @@
 #include "uart.h"
 #include "debug.h"
 
-#include "arcfour.h"
+#include <arcfour.h>
 #include "nessie_stream_test.h"
+#include "cli.h"
+#include "performance_test.h"
 
+#include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -38,7 +41,7 @@ char* cipher_name = "Arcfour";
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
 void arcfour_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
-       arcfour_init(ctx, key, (keysize+7)/8);
+       arcfour_init(key, (uint8_t)((keysize+7)/8), ctx);
 }
 
 
@@ -55,6 +58,33 @@ void testrun_nessie_arcfour(void){
        nessie_stream_run();    
 }
 
+void testrun_performance_arcfour(void){
+       uint64_t t;
+       char str[16];
+       uint8_t key[16];
+       arcfour_ctx_t ctx;
+       
+       calibrateTimer();
+       print_overhead();       
+       
+       memset(key,  0, 16);
+       
+       startTimer(1);
+       arcfour_init(key, 16, &ctx);
+       t = stopTimer();
+       uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
+       ultoa((unsigned long)t, str, 10);
+       uart_putstr(str);       
+       
+       startTimer(1);
+       arcfour_gen(&ctx);
+       t = stopTimer();
+       uart_putstr_P(PSTR("\r\n\tencrypt time: "));
+       ultoa((unsigned long)t, str, 10);
+       uart_putstr(str);       
+       
+       uart_putstr_P(PSTR("\r\n"));    
+}
 
 
 /*****************************************************************************
@@ -64,18 +94,21 @@ void testrun_nessie_arcfour(void){
 int main (void){
        char  str[20];
        DEBUG_INIT();
-       uart_putstr("\r\n");
-
+       
        uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
        uart_putstr(cipher_name);
        uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
 
-restart:
+       PGM_P    u   = PSTR("nessie\0test\0performance\0");
+       void_fpt v[] = {testrun_nessie_arcfour, 
+                           testrun_nessie_arcfour, 
+                           testrun_performance_arcfour};
+
        while(1){ 
-               if (!getnextwordn(str,20))  {DEBUG_S("DBG: W1\r\n"); goto error;}
-               if (strcmp(str, "nessie")) {DEBUG_S("DBG: 1b\r\n"); goto error;}
-                       testrun_nessie_arcfour();
-               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");