X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-arcfour-test.c;h=dcaf2426023c588a705449a0bf785a0d0007c340;hb=22985930c9c2c610ae18e2d8df0f3ea78a082134;hp=9228188d97012cfd0fd809eed01c3c2a34f977df;hpb=701cee0d98aab48dd3192c8cc7c77eb42581bc56;p=avr-crypto-lib.git

diff --git a/test_src/main-arcfour-test.c b/test_src/main-arcfour-test.c
index 9228188..dcaf242 100644
--- a/test_src/main-arcfour-test.c
+++ b/test_src/main-arcfour-test.c
@@ -21,29 +21,22 @@
  * 
 */
 
-#include "config.h"
 
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.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* 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);
 }
 
@@ -52,8 +45,7 @@ void testrun_nessie_arcfour(void){
 }
 
 void testrun_performance_arcfour(void){
-	uint64_t t;
-	char str[16];
+	uint32_t t;
 	uint8_t key[16];
 	arcfour_ctx_t ctx;
 	
@@ -62,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);
 }
 
 
@@ -97,16 +84,14 @@ const 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);
-	}
+    }
+
 }
 
+