fixing E-Mail-Address & Copyright

[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 7e5489220743ca22447c97027dfb7979fb51b396..7f402155138f89e27d11f68147c366145740f4af 100644 (file)
--- a/test_src/main-arcfour-test.c
+++ b/test_src/main-arcfour-test.c
@@ -1,7 +1,7 @@
 /* main-arcfour-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,46 +21,31 @@
  * 
 */
 
-#include "config.h"
-#include "serial-tools.h"
-#include "uart_i.h"
-#include "debug.h"
+
+#include "main-test-common.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>
+#include "scal_arcfour.h"
+#include "scal-basic.h"
+#include "scal-nessie.h"
 
-char* algo_name = "Arcfour";
+char *algo_name = "Arcfour";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
-void arcfour_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
+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 = algo_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];
+       uint32_t t;
        uint8_t key[16];
        arcfour_ctx_t ctx;
        
@@ -69,21 +54,16 @@ void testrun_performance_arcfour(void){
        
        memset(key,  0, 16);
        
+    uart0_flush();
        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);        
-       
+       printf_P(PSTR("\tctx-gen time: %10"PRIu32"\n"), t);
+       uart0_flush();
        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"));     
+       printf_P(PSTR("\tencrypt time: %10"PRIu32"\n"), t);
 }
 
 
@@ -96,7 +76,7 @@ const char test_str[]        PROGMEM = "test";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,      NULL, testrun_nessie_arcfour },
        { test_str,        NULL, testrun_nessie_arcfour},
        { performance_str, NULL, testrun_performance_arcfour},
@@ -104,16 +84,14 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
        { NULL,            NULL, NULL}
 };
 
-int main (void){
-       DEBUG_INIT();
-       
-       cli_rx = (cli_rx_fpt)uart0_getc;
-       cli_tx = (cli_tx_fpt)uart0_putc;                
+int main(void) {
+       main_setup();
+
        for(;;){
-               cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-               cli_putstr(algo_name);
-               cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+               welcome_msg(algo_name);
                cmd_interface(cmdlist);
-       }
+    }
+
 }
 
+