X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-threefish-test.c;h=45ecd0097430e2df31da1f3caeb413ad5403d5cf;hb=9aebf1891ebd2ab61830988a176e8a9da974d93a;hp=da964b36e48d63038602c174557236d67415c7ef;hpb=b5a057d2dfa6b43f3850b3858c11a079eb9086f0;p=avr-crypto-lib.git

diff --git a/test_src/main-threefish-test.c b/test_src/main-threefish-test.c
index da964b3..45ecd00 100644
--- a/test_src/main-threefish-test.c
+++ b/test_src/main-threefish-test.c
@@ -22,14 +22,18 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "threefish.h"
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_threefish256.h"
+#include "bcal_threefish512.h"
+#include "bcal_threefish1024.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -37,9 +41,34 @@
 
 char* algo_name = "Threefish";
 
+const bcdesc_t* const algolist[] PROGMEM = {
+	(bcdesc_t*)&threefish256_desc,
+	(bcdesc_t*)&threefish512_desc,
+	(bcdesc_t*)&threefish1024_desc,
+	NULL
+};
 /*****************************************************************************
  *  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 testrun_nessie_threefish(void){
+	bcal_nessie_multiple(algolist);
+}
+
 void testrun_stdtest_threefish256(void){
 	uint8_t key[32], data[32];
 	uint8_t tweak[16];
@@ -52,16 +81,20 @@ 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_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;
 		data[i] = 0xFF-i;
@@ -69,16 +102,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){
@@ -93,21 +129,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;
@@ -116,22 +152,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){
@@ -146,34 +182,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;
@@ -181,35 +202,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){
@@ -218,110 +224,22 @@ void testrun_stdtest_threefish(void){
 	testrun_stdtest_threefish1024();
 }
 
-void testrun_performance_threefish256(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[THREEFISH256_BLOCKSIZE_B];
-	uint8_t data[THREEFISH256_BLOCKSIZE_B];
-	uint8_t tweak[16];
-	threefish256_ctx_t ctx;
-	
-	cli_putstr_P(PSTR("\r\nThreefish-256 performance:"));
-	
-	calibrateTimer();
-	print_overhead();	
-	
-//	memset(key,  0, THREEFISH256_BLOCKSIZE_B);
-//	memset(tweak, 0, 16);
-	
-	startTimer(1);
-	threefish256_init(key, tweak, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);	
-	
-	startTimer(1);
-	threefish256_enc(data, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);	
-	
-	cli_putstr_P(PSTR("\r\n"));	
-}
-
-void testrun_performance_threefish512(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[THREEFISH512_BLOCKSIZE_B];
-	uint8_t data[THREEFISH512_BLOCKSIZE_B];
-	uint8_t tweak[16];
-	threefish512_ctx_t ctx;
-	
-	cli_putstr_P(PSTR("\r\nThreefish-512 performance:"));
-	
-	calibrateTimer();
-	print_overhead();	
-	
-//	memset(key,  0, THREEFISH512_BLOCKSIZE_B);
-//	memset(tweak, 0, 16);
-	
-	startTimer(1);
-	threefish512_init(key, tweak, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);	
-	
-	startTimer(1);
-	threefish512_enc(data, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);	
-	
-	cli_putstr_P(PSTR("\r\n"));	
+void testrun_performance_threefish(void){
+	bcal_performance_multiple(algolist);
 }
 
-void testrun_performance_threefish1024(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[THREEFISH1024_BLOCKSIZE_B];
-	uint8_t data[THREEFISH1024_BLOCKSIZE_B];
-	uint8_t tweak[16];
-	threefish1024_ctx_t ctx;
-	
-	cli_putstr_P(PSTR("\r\nThreefish-1024 performance:"));
-	
-	calibrateTimer();
-	print_overhead();	
-	
-//	memset(key,  0, THREEFISH1024_BLOCKSIZE_B);
-//	memset(tweak, 0, 16);
-	
-	startTimer(1);
-	threefish1024_init(key, tweak, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);	
-	
-	startTimer(1);
-	threefish1024_enc(data, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);	
-	
-	cli_putstr_P(PSTR("\r\n"));	
+void init_test(void){
+	threefish256_ctx_t ctx;
+	uint8_t key[32], tweak[16];
+	memset(key, 0,32);
+	memset(tweak, 0,16);
+	threefish256_init(key, tweak, &ctx);
+	cli_putstr_P(PSTR("\r\n ctx: \r\n\tk:"));
+	cli_hexdump(ctx.k, 5*8);
+	cli_putstr_P(PSTR("\r\n\tt:"));
+	cli_hexdump(ctx.t, 3*8);
 }
 
-void testrun_performance_threefish(void){
-	testrun_performance_threefish256();
-	testrun_performance_threefish512();
-	testrun_performance_threefish1024();
-}
 
 /*****************************************************************************
  *  main																	 *
@@ -329,12 +247,20 @@ void testrun_performance_threefish(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";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
-//	{ nessie_str,      NULL, testrun_nessie_noekeon},
+const 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},
 	{ NULL,            NULL, NULL}
@@ -343,8 +269,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);