X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=main-grain-test.c;h=44f08f8eee951b9557d275cf5b7b47c0df1945d3;hb=4d76909e4282baf1420ee309e270384246b241b8;hp=d8da7911f826a37d85c25d1470e67733d88145b1;hpb=2b3e134485c42a28f4d8d981c8cb62dc27e71aa5;p=avr-crypto-lib.git

diff --git a/main-grain-test.c b/main-grain-test.c
index d8da791..44f08f8 100644
--- a/main-grain-test.c
+++ b/main-grain-test.c
@@ -1,3 +1,21 @@
+/* main-grain-test.c */
+/*
+    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 /*
  * grain test-suit
  * 
@@ -20,7 +38,7 @@
 char* cipher_name = "Grain";
 
 /*****************************************************************************
- *  additional validation-functions											 *
+ *  additional validation-functions                                          *
  *****************************************************************************/
 void grain_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
 	uint8_t iv[8]={0};
@@ -103,21 +121,13 @@ void testrun_std_grain(void){
 }
 
 void testrun_performance_grain(void){
-	uint16_t i,c;
 	uint64_t t;
 	char str[16];
 	uint8_t key[10], iv[8];
 	grain_ctx_t ctx;
 	
 	calibrateTimer();
-	getOverhead(&c, &i);
-	uart_putstr_P(PSTR("\r\n\r\n=== benchmark ==="));
-	utoa(c, str, 10);
-	uart_putstr_P(PSTR("\r\n\tconst overhead:     "));
-	uart_putstr(str);
-	utoa(i, str, 10);
-	uart_putstr_P(PSTR("\r\n\tinterrupt overhead: "));
-	uart_putstr(str);	
+	print_overhead();	
 	
 	memset(key,  0, 10);
 	memset(iv,  0, 8);
@@ -140,11 +150,9 @@ void testrun_performance_grain(void){
 }
 
 /*****************************************************************************
- *  main																	 *
+ *  main                                                                     *
  *****************************************************************************/
 
-typedef void(*void_fpt)(void);
-
 int main (void){
 	char  str[20];
 	DEBUG_INIT();
@@ -167,3 +175,6 @@ int main (void){
 		uart_putstr("ERROR\r\n");
 	}	
 }
+
+
+