X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-arcfour-test.c;h=9228188d97012cfd0fd809eed01c3c2a34f977df;hb=9aebf1891ebd2ab61830988a176e8a9da974d93a;hp=0e0be9181b9a986971ae360b5c516fff31b08d91;hpb=2159c273c9d3361571a6ff1ab63d9bc76582fbab;p=avr-crypto-lib.git

diff --git a/test_src/main-arcfour-test.c b/test_src/main-arcfour-test.c
index 0e0be91..9228188 100644
--- 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,65 +22,91 @@
 */
 
 #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											 *
  *****************************************************************************/
 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																	 *
  *****************************************************************************/
 
+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){
-	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);
+	}
 }