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

diff --git a/test_src/main-twister256-test.c b/test_src/main-twister256-test.c
index 2a54084..99e1cc2 100644
--- a/test_src/main-twister256-test.c
+++ b/test_src/main-twister256-test.c
@@ -44,14 +44,6 @@ void twister256_init_dummy(void* ctx){
 	twister_small_init(ctx, 256);
 }
 
-void twister256_next_dummy(void* buffer, void* ctx){
-	twister_small_nextBlock(ctx, buffer);
-}
-
-void twister256_last_dummy(void* buffer, uint16_t size_b, void* ctx){
-	twister_small_lastBlock(ctx, buffer, size_b);
-}
-
 void twister256_ctx2hash_dummy(void* buffer, void* ctx){
 	twister_small_ctx2hash(buffer, ctx, 256);
 }
@@ -63,8 +55,8 @@ void testrun_nessie_twister256(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)twister256_init_dummy;
-	nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)twister256_next_dummy;
-	nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)twister256_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)twister256_ctx2hash_dummy;
 	
 	nessie_hash_run();
@@ -76,7 +68,7 @@ void testrun_nessie_twister256(void){
  *****************************************************************************/
 
 void print_hash(void* hash){
-	uart_hexdump(hash, 256/8);
+	cli_hexdump(hash, 256/8);
 }
 
 void testrun_twister256(void){
@@ -91,35 +83,35 @@ void testrun_twister256(void){
 		"12345678901234567890123456789012345678901234567890123456789012345678901234567890"};
 	uint32_t i;
 	
-	uart_putstr_P(PSTR("\r\n=== TWISTER-256 test suit (MD5 test values) ==="));
+	cli_putstr_P(PSTR("\r\n=== TWISTER-256 test suit (MD5 test values) ==="));
 	for(i=0; i<7; ++i){
-		uart_putstr_P(PSTR("\r\n TWISTER-256 (\""));
-		uart_putstr(testv[i]);
-		uart_putstr_P(PSTR("\") = \r\n\t"));
+		cli_putstr_P(PSTR("\r\n TWISTER-256 (\""));
+		cli_putstr(testv[i]);
+		cli_putstr_P(PSTR("\") = \r\n\t"));
 		twister256(&hash, testv[i], strlen(testv[i])*8);
 		print_hash(hash);
 	}
 	
-	uart_putstr_P(PSTR("\r\n\r\n=== TWISTER-256 test suit (short test values) ==="));
+	cli_putstr_P(PSTR("\r\n\r\n=== TWISTER-256 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-256 (\""));
-		uart_hexdump(&(stestv[i]), 1);
-		uart_putstr_P(PSTR("\") = \r\n\t"));
+		cli_putstr_P(PSTR("\r\n TWISTER-256 (\""));
+		cli_hexdump(&(stestv[i]), 1);
+		cli_putstr_P(PSTR("\") = \r\n\t"));
 		twister256(&hash, &(stestv[i]), stestl[i]);
 		print_hash(hash);
 	}
 	
 #ifdef TWISTER_LONGTEST
-	uart_putstr_P(PSTR("\r\n\r\n=== TWISTER-256 test suit (long test) ==="));
+	cli_putstr_P(PSTR("\r\n\r\n=== TWISTER-256 test suit (long test) ==="));
 	char* ltest= "abcdefghbcdefghicdefghijdefghijk"
                            "efghijklfghijklmghijklmnhijklmno";	
 	twister256_ctx_t ctx;
 	twister256_init(&ctx);	
-	uart_putstr_P(PSTR("\r\n TWISTER-256 ( 16777216 x \""));
-	uart_putstr(ltest);	
-	uart_putstr_P(PSTR("\") = \r\n\t"));
+	cli_putstr_P(PSTR("\r\n TWISTER-256 ( 16777216 x \""));
+	cli_putstr(ltest);	
+	cli_putstr_P(PSTR("\") = \r\n\t"));
 	for(i=0; i<16777216; ++i){
 		twister224_nextBlock(&ctx, ltest);
 	}
@@ -143,34 +135,34 @@ void testrun_performance_twister256(void){
 	startTimer(1);
 	twister_small_init(&ctx, 256);
 	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);
 	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);
 	
 	
 	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);
 	
 	startTimer(1);
 	twister_small_ctx2hash(data, &ctx, 256);
 	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);
 
-	uart_putstr_P(PSTR("\r\n"));
+	cli_putstr_P(PSTR("\r\n"));
 }
 
 
@@ -193,13 +185,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);
 	}
 }