X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-xtea-test.c;h=26a42a3785874530c5a211d10361ce08536df40a;hb=628319e6c3018268ef1c307976a0e81e4dc549b8;hp=99a8eb72b627cd808b1e7d72672df9dd7d56939e;hpb=d1181933dc28db92d787cf5604e2fc96ab0d8f9f;p=avr-crypto-lib.git

diff --git a/test_src/main-xtea-test.c b/test_src/main-xtea-test.c
index 99a8eb7..26a42a3 100644
--- a/test_src/main-xtea-test.c
+++ b/test_src/main-xtea-test.c
@@ -21,10 +21,8 @@
  * 
 */
 
-#include "config.h"
 
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "xtea.h"
 #include "nessie_bc_test.h"
@@ -32,14 +30,10 @@
 #include "bcal-performance.h"
 #include "bcal-nessie.h"
 #include "bcal_xtea.h"
-#include "cli.h"
-
-#include <stdint.h>
-#include <string.h>
 
 char* algo_name = "XTEA";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const const algolist[] PROGMEM = {
 	(bcdesc_t*)&xtea_desc,
 	NULL
 };
@@ -54,6 +48,25 @@ void testrun_performance_xtea(void){
 	bcal_performance_multiple(algolist);
 }
 
+void test_xtea(void){
+	uint8_t key[16];
+	uint8_t data[8];
+
+	memset(key, 0, 16);
+	key[0] = 0x80;
+	memset(data, 0, 8);
+	cli_putstr_P(PSTR("\r\n*** XTEA test ***\r\n key:   "));
+	cli_hexdump(key, 16);
+	cli_putstr_P(PSTR("\r\n plain: "));
+	cli_hexdump(data, 8);
+	xtea_enc(data, data, key);
+	cli_putstr_P(PSTR("\r\n crypt: "));
+	cli_hexdump(data, 8);
+	xtea_dec(data, data, key);
+	cli_putstr_P(PSTR("\r\n plain: "));
+	cli_hexdump(data, 8);
+}
+
 /*****************************************************************************
  *  main																	 *
  *****************************************************************************/
@@ -63,23 +76,19 @@ const char test_str[]        PROGMEM = "test";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,      NULL, testrun_nessie_xtea},
-	{ test_str,        NULL, testrun_nessie_xtea},
+	{ test_str,        NULL, test_xtea},
 	{ performance_str, NULL, testrun_performance_xtea},
 	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
 	{ NULL,            NULL, NULL}
 };
 
 int main (void){
-	DEBUG_INIT();
-	
-	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);
+    main_setup();
+
+    for(;;){
+        welcome_msg(algo_name);
+        cmd_interface(cmdlist);
 	}
 }