X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-camellia-test.c;h=2cc64390858b0dd4cba03d9c3b222100eee72e23;hb=c88d9d78db096516eb8aa2aff12c8db1f590738b;hp=b52cb09fae89d33e9e70c231e8841493b4ab3c5e;hpb=17332291e15183d71d88ed868275e3cb53917180;p=avr-crypto-lib.git

diff --git a/test_src/main-camellia-test.c b/test_src/main-camellia-test.c
index b52cb09..2cc6439 100644
--- a/test_src/main-camellia-test.c
+++ b/test_src/main-camellia-test.c
@@ -1,6 +1,6 @@
 /* main-camellia-test.c */
 /*
-    This file is part of the This file is part of the AVR-Crypto-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 "camellia.h"
@@ -31,7 +31,7 @@
 #include "performance_test.h"
 #include "cli.h"
 
-char* cipher_name = "Camellia";
+char* algo_name = "Camellia";
 
 
 #include <stdint.h>
@@ -50,7 +50,7 @@ void camellia128_init_dummy(void* key, uint16_t keysize_b, void* ctx){
 void testrun_nessie_camellia(void){
 	nessie_bc_ctx.blocksize_B =  16;
 	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = cipher_name;
+	nessie_bc_ctx.name        = algo_name;
 	nessie_bc_ctx.ctx_size_B  = sizeof(camellia128_ctx_t);
 	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)camellia128_enc;
 	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)camellia128_dec;
@@ -75,27 +75,27 @@ void test_performance_camellia(void){
 	startTimer(1);
 	camellia128_init(key, &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);
 	camellia128_enc(data, &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);
 	
 	
 	startTimer(1);
 	camellia128_dec(data, &ctx);
 	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"));
 }
 
 
@@ -124,16 +124,16 @@ void testrun_camellia(void){
 
   camellia128_ctx_t ctx;
   camellia128_init(key, &ctx);
-  uart_putstr_P(PSTR("\r\n key:        "));
-  uart_hexdump(data, 16);
-  uart_putstr_P(PSTR("\r\n plaintext:  "));
-  uart_hexdump(data, 16);
+  cli_putstr_P(PSTR("\r\n key:        "));
+  cli_hexdump(data, 16);
+  cli_putstr_P(PSTR("\r\n plaintext:  "));
+  cli_hexdump(data, 16);
   camellia128_enc(data, &ctx);
-  uart_putstr_P(PSTR("\r\n ciphertext: "));
-  uart_hexdump(data, 16);
+  cli_putstr_P(PSTR("\r\n ciphertext: "));
+  cli_hexdump(data, 16);
   camellia128_dec(data, &ctx);
-  uart_putstr_P(PSTR("\r\n decrypted:  "));
-  uart_hexdump(data, 16);
+  cli_putstr_P(PSTR("\r\n decrypted:  "));
+  cli_hexdump(data, 16);
 
 }
 
@@ -142,28 +142,29 @@ void testrun_camellia(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";
 
-	
-	DEBUG_INIT();
-	uart_putstr("\r\n");
+cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,      NULL, testrun_nessie_camellia },
+	{ test_str,        NULL, testrun_camellia},
+	{ performance_str, NULL, test_performance_camellia},
+	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
+	{ NULL,            NULL, NULL}
+};
 
-	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_camellia, testrun_camellia, test_performance_camellia};
+int main (void){
+	DEBUG_INIT();
 	
-	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);
 	}
 }