X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-arcfour-test.c;h=7f402155138f89e27d11f68147c366145740f4af;hp=84fb9543e0bc61472bcc1678cadcb19de4139b85;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=17332291e15183d71d88ed868275e3cb53917180

diff --git a/test_src/main-arcfour-test.c b/test_src/main-arcfour-test.c
index 84fb954..7f40215 100644
--- 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 This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    This file is part of the AVR-Crypto-Lib.
+    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.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* cipher_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 = 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];
+	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();
-	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);	
-	
+	printf_P(PSTR("\tctx-gen time: %10"PRIu32"\n"), t);
+	uart0_flush();
 	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"));	
+	printf_P(PSTR("\tencrypt time: %10"PRIu32"\n"), t);
 }
 
 
@@ -91,29 +71,27 @@ void testrun_performance_arcfour(void){
  *  main																	 *
  *****************************************************************************/
 
-int main (void){
-	char  str[20];
-	DEBUG_INIT();
-	
-	uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-	uart_putstr(cipher_name);
-	uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
-	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(execcommand_d0_P(str, u, v)<0){
-			uart_putstr_P(PSTR("\r\nunknown command\r\n"));
-		}
-		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();
+
+	for(;;){
+		welcome_msg(algo_name);
+		cmd_interface(cmdlist);
+    }
+
 }
 
+