X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=main-present-test.c;h=4c739bcd2f8436d20f215fcea0ee85af36e85cbc;hb=4d76909e4282baf1420ee309e270384246b241b8;hp=a58a6dd194ab66eef079bcd574790cb8d6d8127c;hpb=85b05e7b8648750d0077a74898733536e1b0712f;p=avr-crypto-lib.git

diff --git a/main-present-test.c b/main-present-test.c
index a58a6dd..4c739bc 100644
--- a/main-present-test.c
+++ b/main-present-test.c
@@ -1,3 +1,21 @@
+/* main-present-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/>.
+*/
 /*
  * present test-suit
  * 
@@ -77,21 +95,12 @@ void testrun_self_present(void){
 }
 
 void testrun_performance_present(void){
-	uint16_t i,c;
 	uint64_t t;
-	char str[16];
 	uint8_t key[10], data[8];
 	present_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(data, 0,  8);
@@ -99,23 +108,18 @@ void testrun_performance_present(void){
 	startTimer(1);
 	present_init(key, 80, &ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	print_time_P(PSTR("\tctx-gen time: "),t);
 	
 	startTimer(1);
 	present_enc(data, &ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	print_time_P(PSTR("\tencrypt time: "), t);
 	
 	startTimer(1);
 	present_dec(data, &ctx);
 	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
+	print_time_P(PSTR("\tdecrypt time: "), t);
+	
 	uart_putstr_P(PSTR("\r\n"));
 }
 
@@ -123,8 +127,6 @@ void testrun_performance_present(void){
  *  main																	 *
  *****************************************************************************/
 
-typedef void(*void_fpt)(void);
-
 int main (void){
 	char  str[20];
 	DEBUG_INIT();