X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=main-sha1-test.c;h=6f07227c03722943f459967fc6c6eae9dbb4e8ff;hb=4d76909e4282baf1420ee309e270384246b241b8;hp=c30c3c725737c9b1be75a25f75fc106ea06e2f60;hpb=96ebafd201c9e8441c7677577b24aa402c1defc6;p=avr-crypto-lib.git

diff --git a/main-sha1-test.c b/main-sha1-test.c
index c30c3c7..6f07227 100644
--- a/main-sha1-test.c
+++ b/main-sha1-test.c
@@ -27,14 +27,39 @@
 #include "debug.h"
 
 #include "sha1.h"
+#include "nessie_hash_test.h"
+#include "performance_test.h"
 
 #include <stdint.h>
 #include <string.h>
+#include <stdlib.h>
+#include "cli.h"
 
+char* algo_name = "SHA-1";
 
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
+void sha1_next_dummy(void* buffer, void* ctx){
+	sha1_nextBlock(ctx, buffer);
+}
+
+void sha1_last_dummy(void* buffer, uint16_t size_b, void* ctx){
+	sha1_lastBlock(ctx, buffer, size_b);
+}
+
+void testrun_nessie_sha1(void){
+	nessie_hash_ctx.hashsize_b  = 160;
+	nessie_hash_ctx.blocksize_B = 512/8;
+	nessie_hash_ctx.ctx_size_B  = sizeof(sha1_ctx_t);
+	nessie_hash_ctx.name = algo_name;
+	nessie_hash_ctx.hash_init = (nessie_hash_init_fpt)sha1_init;
+	nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)sha1_next_dummy;
+	nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)sha1_last_dummy;
+	nessie_hash_ctx.hash_conv = (nessie_hash_conv_fpt)sha1_ctx2hash;
+	
+	nessie_hash_run();
+}
 
 /*****************************************************************************
  *  self tests																 *
@@ -79,6 +104,42 @@ void testrun_sha1(void){
 	uart_putstr("\r\nx");
 }
 
+void testrun_performance_sha1(void){
+	uint64_t t;
+	char str[16];
+	uint8_t data[32];
+	sha1_ctx_t ctx;
+	
+	calibrateTimer();
+	print_overhead();
+	
+	memset(data, 0, 32);
+	
+	startTimer(1);
+	sha1_init(&ctx);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
+	ultoa((unsigned long)t, str, 10);
+	uart_putstr(str);
+	
+	
+	startTimer(1);
+	sha1_nextBlock(&ctx, data);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tone-block time: "));
+	ultoa((unsigned long)t, str, 10);
+	uart_putstr(str);
+	
+	
+	startTimer(1);
+	sha1_lastBlock(&ctx, data, 0);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tlast block time: "));
+	ultoa((unsigned long)t, str, 10);
+	uart_putstr(str);
+	
+	uart_putstr_P(PSTR("\r\n"));
+}
 
 
 /*****************************************************************************
@@ -93,17 +154,18 @@ int main (void){
 
 	uart_putstr("\r\n\r\nCrypto-VS (SHA-1)\r\nloaded and running\r\n");
 
-restart:
+	PGM_P    u   = PSTR("nessie\0test\0performance\0");
+	void_fpt v[] = {testrun_nessie_sha1, testrun_sha1, testrun_performance_sha1};
+
 	while(1){ 
-		if (!getnextwordn(str,20))  {DEBUG_S("DBG: W1\r\n"); goto error;}
-		if (strcmp(str, "test")) {DEBUG_S("DBG: 1b\r\n"); goto error;}
-			testrun_sha1();
-		goto restart;		
+		if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}
+		if(execcommand_d0_P(str, u, v)<0){
+			uart_putstr_P(PSTR("\r\nunknown command\r\n"));
+		}
 		continue;
 	error:
 		uart_putstr("ERROR\r\n");
 	}
-	
-	
 }
 
+