X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-arcfour-test.c;h=e66a1d4b13957caa0b4da1100f2674453730d0f1;hb=c88d9d78db096516eb8aa2aff12c8db1f590738b;hp=b5e909e9aef89cf8c562c2e455025dc30af529d4;hpb=6bd58d7909b89a3e05003a63cdc642638fa653e6;p=avr-crypto-lib.git

diff --git a/test_src/main-arcfour-test.c b/test_src/main-arcfour-test.c
index b5e909e..e66a1d4 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,8 +22,8 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include <arcfour.h>
@@ -35,7 +35,7 @@
 #include <stdint.h>
 #include <string.h>
 
-char* cipher_name = "Arcfour";
+char* algo_name = "Arcfour";
 
 /*****************************************************************************
  *  additional validation-functions											 *
@@ -50,7 +50,7 @@ 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.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;
@@ -72,18 +72,18 @@ void testrun_performance_arcfour(void){
 	startTimer(1);
 	arcfour_init(key, 16, &ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
+	cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);	
+	cli_putstr(str);	
 	
 	startTimer(1);
 	arcfour_gen(&ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
+	cli_putstr_P(PSTR("\r\n\tencrypt time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);	
+	cli_putstr(str);	
 	
-	uart_putstr_P(PSTR("\r\n"));	
+	cli_putstr_P(PSTR("\r\n"));	
 }
 
 
@@ -91,29 +91,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_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");
+	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);
 	}
-	
-	
 }