X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-omac-noekeon-test.c;h=377a921f1199419e4ca450387196e16623c7341e;hb=83d0614d8b17eac97f891f7de2bb3ef265751dea;hp=c34d675712774f16896647c57b638f264fdfaf83;hpb=3a571bf2d55c87a3d08641f7df7681c923717eb1;p=avr-crypto-lib.git

diff --git a/test_src/main-omac-noekeon-test.c b/test_src/main-omac-noekeon-test.c
index c34d675..377a921 100644
--- a/test_src/main-omac-noekeon-test.c
+++ b/test_src/main-omac-noekeon-test.c
@@ -1,6 +1,6 @@
 /* main-omac-noekeon-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
@@ -45,16 +45,16 @@ char* algo_name = "OMAC-Noekeon";
 
 void test_mac(void* key, void* data, uint16_t datalength_b){
 	uint8_t mac[16];
-	uart_putstr_P(PSTR("\r\n-----------\r\n msg length (bit): 0x"));
-	uart_hexdump(((uint8_t*)&datalength_b)+1, 1);
-	uart_hexdump(((uint8_t*)&datalength_b)+0, 1);	
-	uart_putstr_P(PSTR("\r\n msg: "));
-	uart_hexdump(data, (datalength_b+7)/8);
-	uart_putstr_P(PSTR("\r\n key: "));
-	uart_hexdump(key, 16);
+	cli_putstr_P(PSTR("\r\n-----------\r\n msg length (bit): 0x"));
+	cli_hexdump(((uint8_t*)&datalength_b)+1, 1);
+	cli_hexdump(((uint8_t*)&datalength_b)+0, 1);	
+	cli_putstr_P(PSTR("\r\n msg: "));
+	cli_hexdump(data, (datalength_b+7)/8);
+	cli_putstr_P(PSTR("\r\n key: "));
+	cli_hexdump(key, 16);
 	omac_noekeon(mac, data, datalength_b, key, (uint8_t)-1);
-	uart_putstr_P(PSTR("\r\n mac: "));
-	uart_hexdump(mac, 16);
+	cli_putstr_P(PSTR("\r\n mac: "));
+	cli_hexdump(mac, 16);
 	
 }
 
@@ -125,56 +125,55 @@ void testrun_performance_omac_noekeon(void){
 	startTimer(1);
 	omac_noekeon_init(&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);
 	omac_noekeon_next(data, key, &ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tone-block time: "));
+	cli_putstr_P(PSTR("\r\n\tone-block time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	cli_putstr(str);
 	
 	
 	startTimer(1);
 	omac_noekeon_last(data, 128, key, &ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tlast block time: "));
+	cli_putstr_P(PSTR("\r\n\tlast block 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"));
 }
 
 /*****************************************************************************
  *  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_omac_noekeon },
+	{ test_str,        NULL, testrun_test_omac_noekeon},
+	{ performance_str, NULL, testrun_performance_omac_noekeon},
+	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
+	{ 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(algo_name);
-	uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
-	PGM_P    u   = PSTR("nessie\0test\0performance\0");
-	void_fpt v[] = {testrun_nessie_omac_noekeon, 
-		            testrun_test_omac_noekeon,
-		            testrun_performance_omac_noekeon};
-
-	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 = uart_getc;
+	cli_tx = uart_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);
+	}
 }
-