X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fnessie_hash_test.c;h=5dc117e31dc373e31f91ade30abb8bd1666f859d;hb=701cee0d98aab48dd3192c8cc7c77eb42581bc56;hp=27df4c1d9cf5044bd99199d0b7016d74d594b1c7;hpb=5c68d38237aa51b91a26309c24e8e38c7fbdffbe;p=avr-crypto-lib.git

diff --git a/test_src/nessie_hash_test.c b/test_src/nessie_hash_test.c
index 27df4c1..5dc117e 100644
--- a/test_src/nessie_hash_test.c
+++ b/test_src/nessie_hash_test.c
@@ -32,6 +32,7 @@
 #include "dbz_strings.h"
 
 nessie_hash_ctx_t nessie_hash_ctx;
+uint8_t           nessie_hash_quick=0;
 
 #define HASHSIZE_B ((nessie_hash_ctx.hashsize_b+7)/8)
 #define BLOCKSIZE_B (nessie_hash_ctx.blocksize_B)
@@ -175,7 +176,7 @@ void tv4_hash(void){
 	NESSIE_PUTC('0' + nessie_hash_ctx.hashsize_b%10);
 
 	NESSIE_PUTSTR_P(PSTR(" zero bits"));
-	memset(block, 0, 256/8);
+	memset(block, 0, nessie_hash_ctx.hashsize_b/8);
 	
 	nessie_hash_ctx.hash_init(ctx);
 	while(n>=nessie_hash_ctx.blocksize_B*8){
@@ -185,6 +186,8 @@ void tv4_hash(void){
 	nessie_hash_ctx.hash_last(ctx, block, n);
 	nessie_hash_ctx.hash_conv(hash, ctx);
 	nessie_print_item("hash", hash, (nessie_hash_ctx.hashsize_b+7)/8);
+	if(nessie_hash_quick)
+		return;
 	for(i=1; i<100000L; ++i){ /* this assumes BLOCKSIZE >= HASHSIZE */
 		nessie_hash_ctx.hash_init(ctx);
 		nessie_hash_ctx.hash_last(ctx, hash, nessie_hash_ctx.hashsize_b);
@@ -212,7 +215,7 @@ void nessie_hash_run(void){
 	
 	nessie_print_header(nessie_hash_ctx.name, 0, 0, nessie_hash_ctx.hashsize_b, 0, 0);
 	/* test set 1 */
-	char* challange_dbz= PSTR(
+	const char* challange_dbz= PSTR(
 		  "\0"
 		"\"\" (empty string)\0"
 		  "a\0"
@@ -242,7 +245,8 @@ void nessie_hash_run(void){
 		ascii_hash_P(challange[2*i], challange[2*i+1]);
 	}
 	nessie_print_set_vector(set, i);
-	amillion_hash();
+	if(!nessie_hash_quick)
+		amillion_hash();
 	/* test set 2 */
 	set=2;
 	nessie_print_setheader(set);