X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=test_src%2Fmain-threefish-test.c;h=1dba3aca5cd1767016c6f305e6452d8643402120;hb=ba4ac1b4a8020026fb6f1a45a1e04e16017262f7;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..1dba3ac 100644
--- a/test_src/main-threefish-test.c
+++ b/test_src/main-threefish-test.c
@@ -40,6 +40,26 @@ char* algo_name = "Threefish";
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
+
+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);
+}
+
+void testrun_nessie_threefish(void){
+	nessie_bc_ctx.keysize_b = 256;
+	nessie_bc_ctx.blocksize_B = 32;
+	nessie_bc_ctx.ctx_size_B = sizeof(threefish256_ctx_t);
+	nessie_bc_ctx.name = "Threefish256";
+	nessie_bc_ctx.cipher_genctx = threefish256_dummy_init;
+	nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)threefish256_enc;
+	nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)threefish256_dec;
+	nessie_bc_ctx.cipher_free = NULL;
+	
+	nessie_bc_run();
+}
+
 void testrun_stdtest_threefish256(void){
 	uint8_t key[32], data[32];
 	uint8_t tweak[16];
@@ -61,7 +81,17 @@ void testrun_stdtest_threefish256(void){
 	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(' ');
+	*/
+	/* second test */
 	for(i=0; i<32; ++i){
 		key[i] = 0x10+i;
 		data[i] = 0xFF-i;
@@ -323,18 +353,33 @@ void testrun_performance_threefish(void){
 	testrun_performance_threefish1024();
 }
 
+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);
+}
+
+
 /*****************************************************************************
  *  main																	 *
  *****************************************************************************/
 
 const char nessie_str[]      PROGMEM = "nessie";
 const char test_str[]        PROGMEM = "test";
+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},
+	{ nessie_str,      NULL, testrun_nessie_threefish},
 	{ test_str,        NULL, testrun_stdtest_threefish},
+	{ inittest_str,    NULL, init_test},
 	{ performance_str, NULL, testrun_performance_threefish},
 	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
 	{ NULL,            NULL, NULL}