migration to SCAL initiated

[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 7ebe5277b9db008026b693f2657dd9b9cbca1edc..760479b21bae2a81532f6c337f170d03eaba94dc 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 AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -22,17 +22,23 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
-#include "arcfour.h"
-#include "nessie_stream_test.h"
+#include <arcfour.h>
+#include "cli.h"
+#include "performance_test.h"
+
+#include "scal_arcfour.h"
+#include "scal-basic.h"
+#include "scal-nessie.h"
 
+#include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 
-char* cipher_name = "Arcfour";
+char* algo_name = "Arcfour";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -41,30 +47,36 @@ void arcfour_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
        arcfour_init(key, (uint8_t)((keysize+7)/8), ctx);
 }
 
-
-
 void testrun_nessie_arcfour(void){
-       nessie_stream_ctx.outsize_b = 8; /* actually unused */
-       nessie_stream_ctx.keysize_b = 128; /* this is theone we have refrence vectors for */
-       nessie_stream_ctx.ivsize_b = (uint16_t)-1;
-       nessie_stream_ctx.name = cipher_name;
-       nessie_stream_ctx.ctx_size_B = sizeof(arcfour_ctx_t);
-       nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)arcfour_genctx_dummy;
-       nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)arcfour_gen;
-       
-       nessie_stream_run();    
+       scal_nessie_run(&arcfour_desc);
 }
 
 void testrun_performance_arcfour(void){
-       nessie_stream_ctx.outsize_b = 8; /* actually unused */
-       nessie_stream_ctx.keysize_b = 128; /* this is theone we have refrence vectors for */
-       nessie_stream_ctx.ivsize_b = (uint16_t)-1;
-       nessie_stream_ctx.name = cipher_name;
-       nessie_stream_ctx.ctx_size_B = sizeof(arcfour_ctx_t);
-       nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)arcfour_genctx_dummy;
-       nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)arcfour_gen;
+       uint64_t t;
+       char str[16];
+       uint8_t key[16];
+       arcfour_ctx_t ctx;
+       
+       calibrateTimer();
+       print_overhead();       
+       
+       memset(key,  0, 16);
        
-       nessie_stream_run();    
+       startTimer(1);
+       arcfour_init(key, 16, &ctx);
+       t = stopTimer();
+       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
+       ultoa((unsigned long)t, str, 10);
+       cli_putstr(str);        
+       
+       startTimer(1);
+       arcfour_gen(&ctx);
+       t = stopTimer();
+       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
+       ultoa((unsigned long)t, str, 10);
+       cli_putstr(str);        
+       
+       cli_putstr_P(PSTR("\r\n"));     
 }
 
 
@@ -72,26 +84,29 @@ void testrun_performance_arcfour(void){
  *  main                                                                                                                                        *
  *****************************************************************************/
 
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
+
+cmdlist_entry_t cmdlist[] PROGMEM = {
+       { nessie_str,      NULL, testrun_nessie_arcfour },
+       { test_str,        NULL, testrun_nessie_arcfour},
+       { performance_str, NULL, testrun_performance_arcfour},
+       { echo_str,    (void*)1, (void_fpt)echo_ctrl},
+       { NULL,            NULL, NULL}
+};
+
 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:
-       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;           
-               continue;
-       error:
-               uart_putstr("ERROR\r\n");
-       }
-       
        
+       cli_rx = (cli_rx_fpt)uart0_getc;
+       cli_tx = (cli_tx_fpt)uart0_putc;                
+       for(;;){
+               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);
+       }
 }