X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-shabea-test.c;h=8605640271c9b2127df660567944091f9ffc8de8;hb=7c82bb323566076ea4f8bc36c94c2dbc0063f27d;hp=f221fd54af6b108b9eb005cb49f1f9e61cddf8e0;hpb=2159c273c9d3361571a6ff1ab63d9bc76582fbab;p=avr-crypto-lib.git

diff --git a/test_src/main-shabea-test.c b/test_src/main-shabea-test.c
index f221fd5..8605640 100644
--- a/test_src/main-shabea-test.c
+++ b/test_src/main-shabea-test.c
@@ -1,6 +1,6 @@
 /* main-shabea-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
@@ -26,8 +26,8 @@
  * 
  */
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "shabea.h"
@@ -39,7 +39,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-char* cipher_name = "Shabea";
+char* algo_name = "Shabea";
 
 /*****************************************************************************
  *  additional validation-functions                                          *
@@ -60,7 +60,7 @@ void shabea_dec_dummy(void* buffer, void* ctx){
 void testrun_nessie_shabea(void){
 	nessie_bc_ctx.blocksize_B =  32;
 	nessie_bc_ctx.keysize_b   = 256;
-	nessie_bc_ctx.name        = cipher_name;
+	nessie_bc_ctx.name        = algo_name;
 	nessie_bc_ctx.ctx_size_B  = 32;
 	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)shabea_enc_dummy;
 	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)shabea_dec_dummy;
@@ -84,19 +84,19 @@ void testrun_performance_shabea(void){
 	startTimer(1);
 	shabea256(data, key, 256, 1, 16);
 	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);
 	
 	
 	startTimer(1);
 	shabea256(data, key, 256, 0, 16);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
+	cli_putstr_P(PSTR("\r\n\tdecrypt 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"));
 }
 
 /*****************************************************************************
@@ -104,24 +104,24 @@ void testrun_performance_shabea(void){
  *****************************************************************************/
 
 void testencrypt(uint8_t* block, uint8_t* key){
-	uart_putstr("\r\n==testy-encrypt==\r\n key: ");
-	uart_hexdump(key,16);
-	uart_putstr("\r\n plain: ");
-	uart_hexdump(block,32);
+	cli_putstr("\r\n==testy-encrypt==\r\n key: ");
+	cli_hexdump(key,16);
+	cli_putstr("\r\n plain: ");
+	cli_hexdump(block,32);
 	shabea256(block,key,128,1,16);
-	uart_putstr("\r\n crypt: ");
-	uart_hexdump(block,32);
+	cli_putstr("\r\n crypt: ");
+	cli_hexdump(block,32);
 }
 
 void testdecrypt(uint8_t* block, uint8_t* key){
 
-	uart_putstr("\r\n==testy-decrypt==\r\n key: ");
-	uart_hexdump(key,16);
-	uart_putstr("\r\n crypt: ");
-	uart_hexdump(block,32);
+	cli_putstr("\r\n==testy-decrypt==\r\n key: ");
+	cli_hexdump(key,16);
+	cli_putstr("\r\n crypt: ");
+	cli_hexdump(block,32);
 	shabea256(block,key,128,0,16);
-	uart_putstr("\r\n plain: ");
-	uart_hexdump(block,32);
+	cli_putstr("\r\n plain: ");
+	cli_hexdump(block,32);
 }
 
 void testrun_shabea(void){
@@ -166,28 +166,28 @@ void testrun_shabea(void){
  *  main																	 *
  *****************************************************************************/
 
-int main (void){
-	char str[20];
+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_shabea},
+	{ test_str,        NULL, testrun_shabea},
+	{ performance_str, NULL, testrun_performance_shabea},
+	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
+	{ NULL,            NULL, NULL}
+};
+
+int main (void){
 	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"));
-
-	PGM_P    u   = PSTR("nessie\0test\0performance\0");
-	void_fpt v[] = {testrun_nessie_shabea, testrun_shabea, testrun_performance_shabea};
-
-	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);
+	}
 }
-