X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-twister224-test.c;h=e38fc88447b04f46eea0d9d4d5d60c8b33301c81;hb=5c68d38237aa51b91a26309c24e8e38c7fbdffbe;hp=d2e0a141b49925f128f427e7b9ec338aaf6900e1;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-twister224-test.c b/test_src/main-twister224-test.c
index d2e0a14..e38fc88 100644
--- a/test_src/main-twister224-test.c
+++ b/test_src/main-twister224-test.c
@@ -46,14 +46,6 @@ void twister224_init_dummy(void* ctx){
 	twister_small_init(ctx, 224);
 }
 
-void twister224_next_dummy(void* buffer, void* ctx){
-	twister_small_nextBlock(ctx, buffer);
-}
-
-void twister224_last_dummy(void* buffer, uint16_t size_b, void* ctx){
-	twister_small_lastBlock(ctx, buffer, size_b);
-}
-
 void twister224_ctx2hash_dummy(void* buffer, void* ctx){
 	twister_small_ctx2hash(buffer, ctx, 224);
 }
@@ -65,8 +57,8 @@ void testrun_nessie_twister224(void){
 	nessie_hash_ctx.ctx_size_B  = sizeof(twister_state_t);
 	nessie_hash_ctx.name = algo_name;
 	nessie_hash_ctx.hash_init = (nessie_hash_init_fpt)twister224_init_dummy;
-	nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)twister224_next_dummy;
-	nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)twister224_last_dummy;
+	nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)twister_small_nextBlock;
+	nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)twister_small_lastBlock;
 	nessie_hash_ctx.hash_conv = (nessie_hash_conv_fpt)twister224_ctx2hash_dummy;
 	
 	nessie_hash_run();
@@ -88,39 +80,39 @@ void testrun_twister224(void){
 		"12345678901234567890123456789012345678901234567890123456789012345678901234567890"};
 	uint32_t i;
 	
-	uart_putstr_P(PSTR("\r\n=== TWISTER-224 test suit (MD5 test values) ==="));
+	cli_putstr_P(PSTR("\r\n=== TWISTER-224 test suit (MD5 test values) ==="));
 	for(i=0; i<7; ++i){
-		uart_putstr_P(PSTR("\r\n TWISTER-224 (\""));
-		uart_putstr(testv[i]);
-		uart_putstr_P(PSTR("\") = \r\n\t"));
+		cli_putstr_P(PSTR("\r\n TWISTER-224 (\""));
+		cli_putstr(testv[i]);
+		cli_putstr_P(PSTR("\") = \r\n\t"));
 		twister224(&hash, testv[i], strlen(testv[i])*8);
-		uart_hexdump(hash, 224/8);
+		cli_hexdump(hash, 224/8);
 	}
 	
-	uart_putstr_P(PSTR("\r\n\r\n=== TWISTER-224 test suit (short test values) ==="));
+	cli_putstr_P(PSTR("\r\n\r\n=== TWISTER-224 test suit (short test values) ==="));
 	uint8_t stestv[]= {0x00, 0x00, 0xC0, 0xC0, 0x80, 0x48, 0x50};
 	uint8_t stestl[]= {   0,    1,    2,    3,    4,    5,    6};	
 	for(i=0; i<7; ++i){
-		uart_putstr_P(PSTR("\r\n TWISTER-224 (\""));
-		uart_hexdump(&(stestv[i]), 1);
-		uart_putstr_P(PSTR("\") = \r\n\t"));
+		cli_putstr_P(PSTR("\r\n TWISTER-224 (\""));
+		cli_hexdump(&(stestv[i]), 1);
+		cli_putstr_P(PSTR("\") = \r\n\t"));
 		twister224(&hash, &(stestv[i]), stestl[i]);
-		uart_hexdump(hash, 224/8);
+		cli_hexdump(hash, 224/8);
 	}
 #ifdef TWISTER_LONGTEST
-	uart_putstr_P(PSTR("\r\n\r\n=== TWISTER-224 test suit (long test) ==="));
+	cli_putstr_P(PSTR("\r\n\r\n=== TWISTER-224 test suit (long test) ==="));
 	char* ltest= "abcdefghbcdefghicdefghijdefghijk"
                            "efghijklfghijklmghijklmnhijklmno";	
 	twister224_ctx_t ctx;
 	twister224_init(&ctx);	
-	uart_putstr_P(PSTR("\r\n TWISTER-224 ( 16777216 x \""));
-	uart_putstr(ltest);	
-	uart_putstr_P(PSTR("\") = \r\n\t"));
+	cli_putstr_P(PSTR("\r\n TWISTER-224 ( 16777216 x \""));
+	cli_putstr(ltest);	
+	cli_putstr_P(PSTR("\") = \r\n\t"));
 	for(i=0; i<16777216; ++i){
 		twister224_nextBlock(&ctx, ltest);
 	}
 	twister224_ctx2hash(hash, &ctx);
-	uart_hexdump(hash, 224/8);
+	cli_hexdump(hash, 224/8);
 #endif
 }
 
@@ -139,9 +131,9 @@ void testrun_performance_twister224(void){
 	startTimer(1);
 	twister_small_init(&ctx, 224);
 	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);
 	
 	i=3000;
 	while(i--)
@@ -150,9 +142,9 @@ void testrun_performance_twister224(void){
 	startTimer(1);
 	twister_small_nextBlock(&ctx, data);
 	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);
 	
 	i=3000;
 	while(i--)
@@ -161,9 +153,9 @@ void testrun_performance_twister224(void){
 	startTimer(1);
 	twister_small_lastBlock(&ctx, data, 0);
 	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);
 
 	i=3000;
 	while(i--)
@@ -172,15 +164,15 @@ void testrun_performance_twister224(void){
 	startTimer(1);
 	twister_small_ctx2hash(data, &ctx, 224);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx2hash time: "));
+	cli_putstr_P(PSTR("\r\n\tctx2hash time: "));
 	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	cli_putstr(str);
 
 	i=3000;
 	while(i--)
 		_delay_ms(1);
 	
-	uart_putstr_P(PSTR("\r\n"));
+	cli_putstr_P(PSTR("\r\n"));
 }
 
 
@@ -203,13 +195,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 int main (void){
 	DEBUG_INIT();
-	uart_putstr("\r\n");
+	
 	cli_rx = uart_getc;
 	cli_tx = uart_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);
 	}
 }