new skipjack test

[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..30801f8a6052a3bbe908a8ca296e6d2eac7cb281 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
@@ -21,66 +21,86 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
 
-#include "arcfour.h"
-#include "nessie_stream_test.h"
+#include "main-test-common.h"
 
-#include <stdint.h>
-#include <string.h>
+#include <arcfour.h>
+#include "performance_test.h"
 
-char* cipher_name = "Arcfour";
+#include "scal_arcfour.h"
+#include "scal-basic.h"
+#include "scal-nessie.h"
+
+char* algo_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);
 }
 
-
-
 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){
+       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();
+       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"));     
+}
 
 
 /*****************************************************************************
  *  main                                                                                                                                        *
  *****************************************************************************/
 
-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");
-       }
-       
-       
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
+
+const 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) {
+       main_setup();
+
+       shavs_algolist=(hfdesc_t**)algolist;
+       shavs_algo=(hfdesc_t*)&sha256_desc;
+
+       for(;;){
+               welcome_msg(algo_name);
+               cmd_interface(cmdlist);
+    }
+
 }
 
+