X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-a5_1-test.c;h=34e6739cc0329bbabd53e4abaa8ad702edba06ea;hb=701cee0d98aab48dd3192c8cc7c77eb42581bc56;hp=a330286633c8bc9690791874845f1d67886e99b3;hpb=7c4486d3328c45462fd276916cb94b80b48725fc;p=avr-crypto-lib.git

diff --git a/test_src/main-a5_1-test.c b/test_src/main-a5_1-test.c
index a330286..34e6739 100644
--- a/test_src/main-a5_1-test.c
+++ b/test_src/main-a5_1-test.c
@@ -1,6 +1,6 @@
 /* main-a5_1-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 <A5_1.h>
@@ -31,8 +31,9 @@
 
 #include <stdint.h>
 #include <string.h>
+#include "cli.h"
 
-char* cipher_name = "A5_1";
+char* algo_name = "A5_1";
 
 /*****************************************************************************
  *  additional validation-functions											 *
@@ -47,7 +48,7 @@ void testrun_nessie_a51(void){
 	nessie_stream_ctx.outsize_b =   8; /* actually unused */
 	nessie_stream_ctx.keysize_b =  64; 
 	nessie_stream_ctx.ivsize_b =   64;
-	nessie_stream_ctx.name = cipher_name;
+	nessie_stream_ctx.name = algo_name;
 	nessie_stream_ctx.ctx_size_B = sizeof(a5_1_ctx_t);
 	nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)a51_genctx_dummy;
 	nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)a5_1_gen;
@@ -61,26 +62,31 @@ void testrun_nessie_a51(void){
  *  main																	 *
  *****************************************************************************/
 
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char testkey_str[]     PROGMEM = "testkey";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
+
+const cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,      NULL, testrun_nessie_a51, NULL},
+/*	{ performance_str, NULL, testrun_performance_a51, NULL}, */
+	{ echo_str,    (void*)1, (void_fpt)echo_ctrl, NULL},
+	{ NULL,            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_a51();
-		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);
+	}
+	
 }