X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=main-des-test.c;h=714781ca59af56e1f10e46e21e6f50e98bd2de2c;hb=619fb7652809ac18d79cb7534e5859ccc10848df;hp=86b76e1930796d8a9079a8790e806441e10d3223;hpb=0f5f75c061a0bf0ab051f8301e0966a101318b98;p=avr-crypto-lib.git

diff --git a/main-des-test.c b/main-des-test.c
index 86b76e1..714781c 100644
--- a/main-des-test.c
+++ b/main-des-test.c
@@ -1,3 +1,21 @@
+/* main-des-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/>.
+*/
 /*
  * des test-suit
  * 
@@ -27,11 +45,11 @@ void des_init_dummy(const void* key, uint16_t keysize_b, void* ctx){
 }
 
 void des_enc_dummy(void* buffer, void* ctx){
-	des_encrypt(buffer, buffer, ctx);
+	des_enc(buffer, buffer, ctx);
 } 
 
 void des_dec_dummy(void* buffer, void* ctx){
-	des_decrypt(buffer, buffer, ctx);
+	des_dec(buffer, buffer, ctx);
 } 
 
 void testrun_nessie_des(void){
@@ -39,7 +57,7 @@ void testrun_nessie_des(void){
 	nessie_bc_ctx.blocksize_B =   8;
 	nessie_bc_ctx.keysize_b   =  64;
 	nessie_bc_ctx.name        = cipher_name;
-	nessie_bc_ctx.ctx_size_B  = sizeof(8);
+	nessie_bc_ctx.ctx_size_B  = 8;
 	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)des_enc_dummy;
 	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)des_dec_dummy;
 	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)des_init_dummy;
@@ -49,34 +67,26 @@ void testrun_nessie_des(void){
 
 
 void testrun_performance_des(void){
-	uint16_t i,c;
 	uint64_t t;
 	char str[16];
 	uint8_t key[8], 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);
 	memset(data, 0, 8);
 	
 	startTimer(1);
-	des_encrypt(data, data, key);
+	des_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);
-	des_decrypt(data, data, key);
+	des_dec(data, data, key);
 	t = stopTimer();
 	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
 	ultoa((unsigned long)t, str, 10);
@@ -84,11 +94,9 @@ void testrun_performance_des(void){
 	uart_putstr_P(PSTR("\r\n"));
 }
 /*****************************************************************************
- *  main																	 *
+ * main						
  *****************************************************************************/
 
-typedef void(*void_fpt)(void);
-
 int main (void){
 	char  str[20];
 	DEBUG_INIT();