X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=main-tdes-test.c;h=d5ae1a00c4d9b745cd07702fd5372a504f28543a;hb=4d76909e4282baf1420ee309e270384246b241b8;hp=aefcb2f51139517a74fa0ee738265fb126a7bd40;hpb=0f5f75c061a0bf0ab051f8301e0966a101318b98;p=avr-crypto-lib.git

diff --git a/main-tdes-test.c b/main-tdes-test.c
index aefcb2f..d5ae1a0 100644
--- a/main-tdes-test.c
+++ b/main-tdes-test.c
@@ -1,3 +1,21 @@
+/* main-tdes-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/>.
+*/
 /*
  * tdes test-suit
  * 
@@ -27,11 +45,11 @@ void tdes_init_dummy(const void* key, uint16_t keysize_b, void* ctx){
 }
 
 void tdes_enc_dummy(void* buffer, void* ctx){
-	tdes_encrypt(buffer, buffer, ctx);
+	tdes_enc(buffer, buffer, ctx);
 } 
 
 void tdes_dec_dummy(void* buffer, void* ctx){
-	tdes_decrypt(buffer, buffer, ctx);
+	tdes_dec(buffer, buffer, ctx);
 } 
 
 void testrun_nessie_tdes(void){
@@ -49,34 +67,26 @@ void testrun_nessie_tdes(void){
 
 
 void testrun_performance_tdes(void){
-	uint16_t i,c;
 	uint64_t t;
 	char str[16];
 	uint8_t key[8*3], data[8];
 	
 	
 	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, 8*3);
 	memset(data, 0, 8);
 	
 	startTimer(1);
-	tdes_encrypt(data, data, key);
+	tdes_enc(data, data, key);
 	t = stopTimer();
 	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
 	ultoa((unsigned long)t, str, 10);
 	uart_putstr(str);
 	
 	startTimer(1);
-	tdes_decrypt(data, data, key);
+	tdes_dec(data, data, key);
 	t = stopTimer();
 	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
 	ultoa((unsigned long)t, str, 10);
@@ -87,8 +97,6 @@ void testrun_performance_tdes(void){
  *  main																	 *
  *****************************************************************************/
 
-typedef void(*void_fpt)(void);
-
 int main (void){
 	char  str[20];
 	DEBUG_INIT();