X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-skipjack-test.c;h=2e311792554dc5a8f68bf05555c9068036350775;hb=52ec168ece9d61bd9cb652235dfe8faee6232a11;hp=5a648b32bbd18c4e3752ff05491ceb61f85200e3;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c
index 5a648b3..2e31179 100644
--- a/test_src/main-skipjack-test.c
+++ b/test_src/main-skipjack-test.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "serial-tools.h"
-#include "uart.h"
+#include "uart_i.h"
 #include "debug.h"
 
 #include "skipjack.h"
@@ -72,19 +72,19 @@ void testrun_performance_skipjack(void){
 	startTimer(1);
 	skipjack_enc(data, key);
 	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);
 	skipjack_dec(data, key);
 	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"));
 }
 
 /*****************************************************************************
@@ -92,23 +92,23 @@ void testrun_performance_skipjack(void){
  *****************************************************************************/
 
 void testencrypt(uint8_t* block, uint8_t* key){
-	uart_putstr("\r\n==testy-encrypt==\r\n key: ");
-	uart_hexdump(key,10);
-	uart_putstr("\r\n plain: ");
-	uart_hexdump(block,8);
+	cli_putstr("\r\n==testy-encrypt==\r\n key: ");
+	cli_hexdump(key,10);
+	cli_putstr("\r\n plain: ");
+	cli_hexdump(block,8);
 	skipjack_enc(block,key);
-	uart_putstr("\r\n crypt: ");
-	uart_hexdump(block,8);
+	cli_putstr("\r\n crypt: ");
+	cli_hexdump(block,8);
 }
 
 void testdecrypt(uint8_t* block, uint8_t* key){
-	uart_putstr("\r\n==testy-decrypt==\r\n key: ");
-	uart_hexdump(key,10);
-	uart_putstr("\r\n crypt: ");
-	uart_hexdump(block,8);
+	cli_putstr("\r\n==testy-decrypt==\r\n key: ");
+	cli_hexdump(key,10);
+	cli_putstr("\r\n crypt: ");
+	cli_hexdump(block,8);
 	skipjack_dec(block,key);
-	uart_putstr("\r\n plain: ");
-	uart_hexdump(block,8);
+	cli_putstr("\r\n plain: ");
+	cli_hexdump(block,8);
 }
 
 void testrun_skipjack(void){
@@ -152,13 +152,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 int main (void){
 	DEBUG_INIT();
-	uart_putstr("\r\n");
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+	
+	cli_rx = (cli_rx_fpt)uart0_getc;
+	cli_tx = (cli_tx_fpt)uart0_putc;	 	
 	for(;;){
-		uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		uart_putstr(algo_name);
-		uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+		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);
 	}
 }