X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=main-serpent-test.c;h=5c450b64df58282e38797b46216f5d4a8a279fdc;hb=4d76909e4282baf1420ee309e270384246b241b8;hp=9f385b1956d3b598515cc144c067ad432d2d8103;hpb=f746b1cd8b111c52014e72d6c86d0d159721b5ce;p=avr-crypto-lib.git

diff --git a/main-serpent-test.c b/main-serpent-test.c
index 9f385b1..5c450b6 100644
--- a/main-serpent-test.c
+++ b/main-serpent-test.c
@@ -1,3 +1,21 @@
+/* main-serpent-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/>.
+*/
 /*
  * serpent test-suit
  * 
@@ -23,7 +41,7 @@ char* cipher_name = "Serpent";
  *  additional validation-functions											 *
  *****************************************************************************/
 void serpent_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
-	serpent_genctx(key, keysize&0xff, ctx);
+	serpent_init(key, keysize&0xff, ctx);
 }
 
 void testrun_nessie_serpent(void){
@@ -46,27 +64,19 @@ void testrun_nessie_serpent(void){
 
 
 void testrun_performance_serpent(void){
-	uint16_t i,c;
 	uint64_t t;
 	char str[16];
 	uint8_t key[32], data[16];
 	serpent_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, 32);
 	memset(data, 0, 16);
 	
 	startTimer(1);
-	serpent_genctx(key, 0, &ctx);
+	serpent_init(key, 0, &ctx);
 	t = stopTimer();
 	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
 	ultoa((unsigned long)t, str, 10);