X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-arcfour-test.c;h=89df1c71d6246f7c7f542b642b541c54b25466b8;hb=5a83cf2b010b74721dec56d940dcf457fae24205;hp=f16c2db42344d66198e4c43a4b94841a51176d60;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-arcfour-test.c b/test_src/main-arcfour-test.c
index f16c2db..89df1c7 100644
--- a/test_src/main-arcfour-test.c
+++ b/test_src/main-arcfour-test.c
@@ -21,19 +21,15 @@
  * 
 */
 
-#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* algo_name = "Arcfour";
 
@@ -44,18 +40,8 @@ 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){
@@ -72,18 +58,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"));	
 }
 
 
@@ -96,7 +82,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 +90,14 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ NULL,            NULL, NULL}
 };
 
-int main (void){
-	DEBUG_INIT();
-	uart_putstr("\r\n");
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+int main(void) {
+	main_setup();
+
 	for(;;){
-		uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		uart_putstr(algo_name);
-		uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+		welcome_msg(algo_name);
 		cmd_interface(cmdlist);
-	}
+    }
+
 }
 
+