X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-threefish-test.c;h=f0af2b526d1239d1da4f348df749ed78543fe984;hb=52ec168ece9d61bd9cb652235dfe8faee6232a11;hp=1dba3aca5cd1767016c6f305e6452d8643402120;hpb=ba4ac1b4a8020026fb6f1a45a1e04e16017262f7;p=avr-crypto-lib.git

diff --git a/test_src/main-threefish-test.c b/test_src/main-threefish-test.c
index 1dba3ac..f0af2b5 100644
--- a/test_src/main-threefish-test.c
+++ b/test_src/main-threefish-test.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "serial-tools.h"
-#include "uart.h"
+#include "uart_i.h"
 #include "debug.h"
 
 #include "threefish.h"
@@ -41,13 +41,25 @@ char* algo_name = "Threefish";
  *  additional validation-functions											 *
  *****************************************************************************/
 
+void threefish256_dump(threefish256_ctx_t* ctx){
+	uint8_t i;
+	cli_putstr_P(PSTR("\r\n=== ctx dump (256) === \r\n k: "));
+	for(i=0; i<5; ++i){
+		cli_hexdump(&(ctx->k[i]), 8);
+		cli_putc(' ');
+	}
+	cli_putstr_P(PSTR("\r\n t: "));
+	for(i=0; i<3; ++i){
+		cli_hexdump(&(ctx->t[i]), 8);
+		cli_putc(' ');
+	}
+}
+
 void threefish256_dummy_init(const uint8_t* key, uint16_t keysize_b, void* ctx){
-	uint8_t null[16];
-	memset(null, 0, 16);
-	threefish256_init(key, null, ctx);
+	threefish256_init(key, NULL, ctx);
 }
 
-void testrun_nessie_threefish(void){
+void testrun_nessie_threefish256(void){
 	nessie_bc_ctx.keysize_b = 256;
 	nessie_bc_ctx.blocksize_B = 32;
 	nessie_bc_ctx.ctx_size_B = sizeof(threefish256_ctx_t);
@@ -60,6 +72,46 @@ void testrun_nessie_threefish(void){
 	nessie_bc_run();
 }
 
+void threefish512_dummy_init(const uint8_t* key, uint16_t keysize_b, void* ctx){
+	threefish512_init(key, NULL, ctx);
+}
+
+void testrun_nessie_threefish512(void){
+	nessie_bc_ctx.keysize_b = 512;
+	nessie_bc_ctx.blocksize_B = 64;
+	nessie_bc_ctx.ctx_size_B = sizeof(threefish512_ctx_t);
+	nessie_bc_ctx.name = "Threefish512";
+	nessie_bc_ctx.cipher_genctx = threefish512_dummy_init;
+	nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)threefish512_enc;
+	nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)threefish512_dec;
+	nessie_bc_ctx.cipher_free = NULL;
+	
+	nessie_bc_run();
+}
+
+void threefish1024_dummy_init(const uint8_t* key, uint16_t keysize_b, void* ctx){
+	threefish1024_init(key, NULL, ctx);
+}
+
+void testrun_nessie_threefish1024(void){
+	nessie_bc_ctx.keysize_b = 1024;
+	nessie_bc_ctx.blocksize_B = 128;
+	nessie_bc_ctx.ctx_size_B = sizeof(threefish1024_ctx_t);
+	nessie_bc_ctx.name = "Threefish1024";
+	nessie_bc_ctx.cipher_genctx = threefish1024_dummy_init;
+	nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)threefish1024_enc;
+	nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)threefish1024_dec;
+	nessie_bc_ctx.cipher_free = NULL;
+	
+	nessie_bc_run();
+}
+
+void testrun_nessie_threefish(void){
+	testrun_nessie_threefish256();
+	testrun_nessie_threefish512();
+	testrun_nessie_threefish1024();
+}
+
 void testrun_stdtest_threefish256(void){
 	uint8_t key[32], data[32];
 	uint8_t tweak[16];
@@ -72,25 +124,19 @@ void testrun_stdtest_threefish256(void){
 	memset(tweak, 0, 16);
 	
 	cli_putstr_P(PSTR("\r\nkey:    "));
-	cli_hexdump(key, 32);
+	cli_hexdump_block(key, 32, 4, 16);
 	cli_putstr_P(PSTR("\r\ntweak:  "));
-	cli_hexdump(tweak, 16);
+	cli_hexdump_block(tweak, 16, 4, 16);
 	cli_putstr_P(PSTR("\r\nplain:  "));
-	cli_hexdump(data, 32);
+	cli_hexdump_block(data, 32, 4, 16);
 	threefish256_init(key, tweak, &ctx);
 	threefish256_enc(data, &ctx);
 	cli_putstr_P(PSTR("\r\ncipher: "));
-	cli_hexdump(data, 32);
-	/* 
-	cli_hexdump_rev(data, 8);
-	cli_putc(' ');
-	cli_hexdump_rev(data+8, 8);
-	cli_putc(' ');
-	cli_hexdump_rev(data+16, 8);
-	cli_putc(' ');
-	cli_hexdump_rev(data+24, 8);
-	cli_putc(' ');
-	*/
+	cli_hexdump_block(data, 32, 4, 16);
+	cli_putstr_P(PSTR("\r\ndecipher: "));
+	threefish256_dec(data, &ctx);
+	cli_hexdump_block(data, 32, 4, 16);
+	
 	/* second test */
 	for(i=0; i<32; ++i){
 		key[i] = 0x10+i;
@@ -99,16 +145,19 @@ void testrun_stdtest_threefish256(void){
 	for(i=0; i<16; ++i){
 		tweak[i] = i;
 	}
-	cli_putstr_P(PSTR("\r\n\r\nkey:    "));
-	cli_hexdump(key, 32);
+	cli_putstr_P(PSTR("\r\nkey:    "));
+	cli_hexdump_block(key, 32, 4, 16);
 	cli_putstr_P(PSTR("\r\ntweak:  "));
-	cli_hexdump(tweak, 16);
+	cli_hexdump_block(tweak, 16, 4, 16);
 	cli_putstr_P(PSTR("\r\nplain:  "));
-	cli_hexdump(data, 32);
+	cli_hexdump_block(data, 32, 4, 16);
 	threefish256_init(key, tweak, &ctx);
 	threefish256_enc(data, &ctx);
 	cli_putstr_P(PSTR("\r\ncipher: "));
-	cli_hexdump(data, 32);
+	cli_hexdump_block(data, 32, 4, 16);
+	cli_putstr_P(PSTR("\r\ndecipher: "));
+	threefish256_dec(data, &ctx);
+	cli_hexdump_block(data, 32, 4, 16);
 }
 
 void testrun_stdtest_threefish512(void){
@@ -123,21 +172,21 @@ void testrun_stdtest_threefish512(void){
 	memset(tweak, 0, 16);
 	
 	cli_putstr_P(PSTR("\r\nkey:    "));
-	cli_hexdump(key, 32);
+	cli_hexdump_block(key, 32, 4, 16);
 	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(key+32, 32);
+	cli_hexdump_block(key+32, 32, 4, 16);
 	cli_putstr_P(PSTR("\r\ntweak:  "));
-	cli_hexdump(tweak, 16);
+	cli_hexdump_block(tweak, 16, 4, 16);
 	cli_putstr_P(PSTR("\r\nplain:  "));
-	cli_hexdump(data, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+32, 32);
+	cli_hexdump_block(data, 64, 4, 16);
 	threefish512_init(key, tweak, &ctx);
 	threefish512_enc(data, &ctx);
 	cli_putstr_P(PSTR("\r\ncipher: "));
-	cli_hexdump(data, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+32, 32);
+	cli_hexdump_block(data, 64, 4, 16);
+	threefish512_dec(data, &ctx);
+	cli_putstr_P(PSTR("\r\ndecipher: "));
+	cli_hexdump_block(data, 64, 4, 16);
+	
 	
 	for(i=0; i<64; ++i){
 		key[i] = 0x10+i;
@@ -146,22 +195,22 @@ void testrun_stdtest_threefish512(void){
 	for(i=0; i<16; ++i){
 		tweak[i] = i;
 	}
-	cli_putstr_P(PSTR("\r\n\r\nkey:    "));
-	cli_hexdump(key, 32);
+	cli_putstr_P(PSTR("\r\nkey:    "));
+	cli_hexdump_block(key, 32, 4, 16);
 	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(key+32, 32);
+	cli_hexdump_block(key+32, 32, 4, 16);
 	cli_putstr_P(PSTR("\r\ntweak:  "));
-	cli_hexdump(tweak, 16);
+	cli_hexdump_block(tweak, 16, 4, 16);
 	cli_putstr_P(PSTR("\r\nplain:  "));
-	cli_hexdump(data, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+32, 32);
+	cli_hexdump_block(data, 64, 4, 16);
 	threefish512_init(key, tweak, &ctx);
 	threefish512_enc(data, &ctx);
 	cli_putstr_P(PSTR("\r\ncipher: "));
-	cli_hexdump(data, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+32, 32);
+	cli_hexdump_block(data, 64, 4, 16);
+	threefish512_dec(data, &ctx);
+	cli_putstr_P(PSTR("\r\ndecipher: "));
+	cli_hexdump_block(data, 64, 4, 16);
+	
 }
 
 void testrun_stdtest_threefish1024(void){
@@ -176,34 +225,19 @@ void testrun_stdtest_threefish1024(void){
 	memset(tweak, 0, 16);
 	
 	cli_putstr_P(PSTR("\r\nkey:    "));
-	cli_hexdump(key, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(key+32, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(key+64, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(key+96, 32);
+	cli_hexdump_block(key, 128, 4, 16);
 	cli_putstr_P(PSTR("\r\ntweak:  "));
-	cli_hexdump(tweak, 16);
+	cli_hexdump_block(tweak, 16, 4, 16);
 	cli_putstr_P(PSTR("\r\nplain:  "));
-	cli_hexdump(data, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+32, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+64, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+96, 32);
+	cli_hexdump_block(data, 128, 4, 16);
 	threefish1024_init(key, tweak, &ctx);
 	threefish1024_enc(data, &ctx);
 	cli_putstr_P(PSTR("\r\ncipher: "));
-	cli_hexdump(data, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+32, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+64, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+96, 32);
-	
+	cli_hexdump_block(data, 128, 4, 16);
+	threefish1024_dec(data, &ctx);
+	cli_putstr_P(PSTR("\r\ndecipher: "));
+	cli_hexdump_block(data, 128, 4, 16);
+
 	for(i=0; i<128; ++i){
 		key[i] = 0x10+i;
 		data[i] = 0xFF-i;
@@ -211,35 +245,20 @@ void testrun_stdtest_threefish1024(void){
 	for(i=0; i<16; ++i){
 		tweak[i] = i;
 	}
-	cli_putstr_P(PSTR("\r\n\r\nkey:    "));
-	cli_hexdump(key, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(key+32, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(key+64, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(key+96, 32);
+	cli_putstr_P(PSTR("\r\nkey:    "));
+	cli_hexdump_block(key, 128, 4, 16);
 	cli_putstr_P(PSTR("\r\ntweak:  "));
-	cli_hexdump(tweak, 16);
+	cli_hexdump_block(tweak, 16, 4, 16);
 	cli_putstr_P(PSTR("\r\nplain:  "));
-	cli_hexdump(data, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+32, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+64, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+96, 32);
+	cli_hexdump_block(data, 128, 4, 16);
 	threefish1024_init(key, tweak, &ctx);
 	threefish1024_enc(data, &ctx);
 	cli_putstr_P(PSTR("\r\ncipher: "));
-	cli_hexdump(data, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+32, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+64, 32);
-	cli_putstr_P(PSTR("\r\n        "));
-	cli_hexdump(data+96, 32);
-	}
+	cli_hexdump_block(data, 128, 4, 16);
+	threefish1024_dec(data, &ctx);
+	cli_putstr_P(PSTR("\r\ndecipher: "));
+	cli_hexdump_block(data, 128, 4, 16);
+}
 
 
 void testrun_stdtest_threefish(void){
@@ -278,6 +297,12 @@ void testrun_performance_threefish256(void){
 	ultoa((unsigned long)t, str, 10);
 	cli_putstr(str);	
 	
+	startTimer(1);
+	threefish256_dec(data, &ctx);
+	t = stopTimer();
+	cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
+	ultoa((unsigned long)t, str, 10);
+	cli_putstr(str);	
 	cli_putstr_P(PSTR("\r\n"));	
 }
 
@@ -311,6 +336,13 @@ void testrun_performance_threefish512(void){
 	ultoa((unsigned long)t, str, 10);
 	cli_putstr(str);	
 	
+	startTimer(1);
+	threefish512_dec(data, &ctx);
+	t = stopTimer();
+	cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
+	ultoa((unsigned long)t, str, 10);
+	cli_putstr(str);	
+	
 	cli_putstr_P(PSTR("\r\n"));	
 }
 
@@ -344,6 +376,13 @@ void testrun_performance_threefish1024(void){
 	ultoa((unsigned long)t, str, 10);
 	cli_putstr(str);	
 	
+	startTimer(1);
+	threefish1024_dec(data, &ctx);
+	t = stopTimer();
+	cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
+	ultoa((unsigned long)t, str, 10);
+	cli_putstr(str);	
+	
 	cli_putstr_P(PSTR("\r\n"));	
 }
 
@@ -372,6 +411,9 @@ void init_test(void){
 
 const char nessie_str[]      PROGMEM = "nessie";
 const char test_str[]        PROGMEM = "test";
+const char test256_str[]     PROGMEM = "test256";
+const char test512_str[]     PROGMEM = "test512";
+const char test1024_str[]    PROGMEM = "test1024";
 const char inittest_str[]    PROGMEM = "inittest";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
@@ -379,6 +421,9 @@ const char echo_str[]        PROGMEM = "echo";
 cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,      NULL, testrun_nessie_threefish},
 	{ test_str,        NULL, testrun_stdtest_threefish},
+    { test256_str,     NULL, testrun_stdtest_threefish256},
+    { test512_str,     NULL, testrun_stdtest_threefish512},
+    { test1024_str,    NULL, testrun_stdtest_threefish1024},
 	{ inittest_str,    NULL, init_test},
 	{ performance_str, NULL, testrun_performance_threefish},
 	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
@@ -388,8 +433,8 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 int main (void){
 	DEBUG_INIT();
 	
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+	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);