X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-blake-test.c;h=6b18c38d0c9c7593e4bb41d15e7f059e16ca6fcc;hb=b8d6b2bd3ddea45506f584c7d44fe5fff0557ed1;hp=54f1902ac1a56a4455b114546f0b677bc7de7465;hpb=7605b81a4b6f8b2bf7065e9b51116443a1ce64c4;p=avr-crypto-lib.git

diff --git a/test_src/main-blake-test.c b/test_src/main-blake-test.c
index 54f1902..6b18c38 100644
--- a/test_src/main-blake-test.c
+++ b/test_src/main-blake-test.c
@@ -18,12 +18,12 @@
 */
 /*
  * blake test-suit
- * 
+ *
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "blake_small.h"
@@ -76,7 +76,7 @@ void blake64_test(void* msg, uint32_t length_b){
 	hfal_test(&blake64_desc, msg, length_b);
 }
 void testrun_stdtest_blake(void){
-	uint8_t msg1[144]; 
+	uint8_t msg1[144];
 	memset(msg1, 0, 144);
 	blake28_test("", 8);
 	blake28_test(msg1, 576);
@@ -96,109 +96,19 @@ void testlshort(void){
 	blake64_test("", 8);
 }
 
-void performance_blake(void){
-	uint64_t t;
-	char str[16];
-	uint8_t data[64];
-	uint8_t hash[512/8];
-	blake_small_ctx_t ctx;
-	blake_large_ctx_t ctx2;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(data, 0, 64);
-	
-	
-	startTimer(1);
-	blake28_init(&ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx-gen time (224): "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	startTimer(1);
-	blake32_init(&ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx-gen time (256): "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-
-	startTimer(1);
-	blake48_init(&ctx2);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx-gen time (384): "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	startTimer(1);
-	blake64_init(&ctx2);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx-gen time (512): "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-		
-	startTimer(1);
-	blake_small_nextBlock(&ctx, data);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tone-block (small) time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	startTimer(1);
-	blake_large_nextBlock(&ctx2, data);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tone-block (large) time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-		
-	startTimer(1);
-	blake_small_lastBlock(&ctx, data, 0);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tlast block (small) time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	startTimer(1);
-	blake_large_lastBlock(&ctx2, data, 0);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tlast block (large) time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	startTimer(1);
-	blake28_ctx2hash(hash, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx2hash time (224): "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	startTimer(1);
-	blake32_ctx2hash(hash, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx2hash time (256): "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-
-	startTimer(1);
-	blake48_ctx2hash(hash, &ctx2);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx2hash time (384): "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	startTimer(1);
-	blake64_ctx2hash(hash, &ctx2);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx2hash time (512): "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-		
-	cli_putstr_P(PSTR("\r\n"));
-
+void test512_32(void){
+  uint8_t d[] = { 0xE9, 0x26, 0xAE, 0x8B, 0x0A, 0xF6, 0xE5, 0x31,
+				 0x76, 0xDB, 0xFF, 0xCC, 0x2A, 0x6B, 0x88, 0xC6,
+				 0xBD, 0x76, 0x5F, 0x93, 0x9D, 0x3D, 0x17, 0x8A,
+				 0x9B, 0xDE, 0x9E, 0xF3, 0xAA, 0x13, 0x1C, 0x61,
+				 0xE3, 0x1C, 0x1E, 0x42, 0xCD, 0xFA, 0xF4, 0xB4,
+				 0xDC, 0xDE, 0x57, 0x9A, 0x37, 0xE1, 0x50, 0xEF,
+				 0xBE, 0xF5, 0x55, 0x5B, 0x4C, 0x1C, 0xB4, 0x04,
+				 0x39, 0xD8, 0x35, 0xA7, 0x24, 0xE2, 0xFA, 0xE7 };
+	blake32_test(d, 512);
 }
 
-void autoperformance_blake(void){
+void performance_blake(void){
 	hfal_performance_multiple(algolist);
 }
 
@@ -211,32 +121,34 @@ const char nessie_str[]       PROGMEM = "nessie";
 const char test_str[]         PROGMEM = "test";
 const char testshort_str[]    PROGMEM = "short";
 const char testlshort_str[]   PROGMEM = "lshort";
+const char test512_str[]      PROGMEM = "test512";
 const char performance_str[]  PROGMEM = "performance";
-const char aperformance_str[] PROGMEM = "autoperformance";
 const char echo_str[]         PROGMEM = "echo";
 const char shavs_list_str[]   PROGMEM = "shavs_list";
 const char shavs_set_str[]    PROGMEM = "shavs_set";
 const char shavs_test1_str[]  PROGMEM = "shavs_test1";
+const char shavs_test3_str[]  PROGMEM = "shavs_test3";
 
 cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,          NULL, testrun_nessie_blake},
 	{ test_str,            NULL, testrun_stdtest_blake},
 	{ testshort_str,       NULL, testshort},
 	{ testlshort_str,      NULL, testlshort},
+	{ test512_str,         NULL, test512_32},
 	{ performance_str,     NULL, performance_blake},
-	{ aperformance_str,    NULL, autoperformance_blake},
 	{ shavs_list_str,      NULL, shavs_listalgos},
 	{ shavs_set_str,   (void*)1, (void_fpt)shavs_setalgo},
 	{ shavs_test1_str,     NULL, shavs_test1},
+	{ shavs_test3_str,     NULL, shavs_test3},
 	{ echo_str,        (void*)1, (void_fpt)echo_ctrl},
 	{ NULL,                NULL, NULL}
 };
 
 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;
 	shavs_algolist=(hfdesc_t**)algolist;
 	shavs_algo=(hfdesc_t*)&blake32_desc;
 	for(;;){
@@ -247,7 +159,7 @@ int main (void){
 		cli_putstr_P(PSTR(" "));
 		cli_putstr(__TIME__);
 		cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-		
+
 		cmd_interface(cmdlist);
 	}
-}	
+}