X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-twister224-test.c;h=dbc58832d5da83bfc8bdf5032f47219909002551;hb=17332291e15183d71d88ed868275e3cb53917180;hp=a812e2f31b1208f2b818517311253708d9ad9b21;hpb=cca97d0e0c937aea8b7e0ae5b931da5f80d9ff52;p=avr-crypto-lib.git

diff --git a/test_src/main-twister224-test.c b/test_src/main-twister224-test.c
index a812e2f..dbc5883 100644
--- a/test_src/main-twister224-test.c
+++ b/test_src/main-twister224-test.c
@@ -1,6 +1,6 @@
 /* main-twister224-test.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    This file is part of the This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -30,6 +30,8 @@
 #include "nessie_hash_test.h"
 #include "performance_test.h"
 
+#include <util/delay.h>
+
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
@@ -105,7 +107,7 @@ void testrun_twister224(void){
 		twister224(&hash, &(stestv[i]), stestl[i]);
 		uart_hexdump(hash, 224/8);
 	}
-
+#ifdef TWISTER_LONGTEST
 	uart_putstr_P(PSTR("\r\n\r\n=== TWISTER-224 test suit (long test) ==="));
 	char* ltest= "abcdefghbcdefghicdefghijdefghijk"
                            "efghijklfghijklmghijklmnhijklmno";	
@@ -119,6 +121,7 @@ void testrun_twister224(void){
 	}
 	twister224_ctx2hash(hash, &ctx);
 	uart_hexdump(hash, 224/8);
+#endif
 }
 
 
@@ -127,7 +130,7 @@ void testrun_performance_twister224(void){
 	char str[16];
 	uint8_t data[64];
 	twister_state_t ctx;
-	
+	volatile uint16_t i;
 	calibrateTimer();
 	print_overhead();
 	
@@ -140,6 +143,9 @@ void testrun_performance_twister224(void){
 	ultoa((unsigned long)t, str, 10);
 	uart_putstr(str);
 	
+	i=3000;
+	while(i--)
+		_delay_ms(1);
 	
 	startTimer(1);
 	twister_small_nextBlock(&ctx, data);
@@ -148,6 +154,9 @@ void testrun_performance_twister224(void){
 	ultoa((unsigned long)t, str, 10);
 	uart_putstr(str);
 	
+	i=3000;
+	while(i--)
+		_delay_ms(1);
 	
 	startTimer(1);
 	twister_small_lastBlock(&ctx, data, 0);
@@ -155,7 +164,11 @@ void testrun_performance_twister224(void){
 	uart_putstr_P(PSTR("\r\n\tlast block time: "));
 	ultoa((unsigned long)t, str, 10);
 	uart_putstr(str);
-	
+
+	i=3000;
+	while(i--)
+		_delay_ms(1);
+
 	startTimer(1);
 	twister_small_ctx2hash(data, &ctx, 224);
 	t = stopTimer();
@@ -163,6 +176,10 @@ void testrun_performance_twister224(void){
 	ultoa((unsigned long)t, str, 10);
 	uart_putstr(str);
 
+	i=3000;
+	while(i--)
+		_delay_ms(1);
+	
 	uart_putstr_P(PSTR("\r\n"));
 }