X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=main-noekeon-test.c;h=fdac8c14506796e6aab08ed6d07858f38f9a0991;hb=96ebafd201c9e8441c7677577b24aa402c1defc6;hp=43eb3a90fc5080d481644d5ff7ae179b4078c60c;hpb=9e7453525f32441ea49ef1d9b3248e94d9554eec;p=avr-crypto-lib.git

diff --git a/main-noekeon-test.c b/main-noekeon-test.c
index 43eb3a9..fdac8c1 100644
--- a/main-noekeon-test.c
+++ b/main-noekeon-test.c
@@ -1,3 +1,21 @@
+/* main-noekeon-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
  * 
@@ -127,7 +145,6 @@ void testrun_stdtest_noekeon(void){
 	noekeon_enc(data, &ctx);
 	testrun_stdtest_runindirect(data, key3);
 	
-	
 	uart_putstr_P(PSTR("\r\nTest vectors for block cipher Noekeon in Direct-Key Mode:\r\n"));
 	
 	memset(key,  0, 16);
@@ -152,7 +169,7 @@ void testrun_stdtest_noekeon(void){
 void testrun_performance_noekeon(void){
 	uint16_t i,c;
 	uint64_t t;
-	char str[6];
+	char str[16];
 	uint8_t key[16], data[16];
 	noekeon_ctx_t ctx;
 	
@@ -173,29 +190,29 @@ void testrun_performance_noekeon(void){
 	noekeon_init(key, &ctx);
 	t = stopTimer();
 	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	uart_hexdump(&t, 8);
-	
+	ultoa((unsigned long)t, str, 10);
+	uart_putstr(str);	
 	
 	startTimer(1);
-	noekeon_enc(data, ctx);
+	noekeon_enc(data, &ctx);
 	t = stopTimer();
 	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-	uart_hexdump(&t, 8);
-	
+	ultoa((unsigned long)t, str, 10);
+	uart_putstr(str);	
 	
 	startTimer(1);
-	noekeon_dec(data, ctx);
+	noekeon_dec(data, &ctx);
 	t = stopTimer();
 	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
-	uart_hexdump(&t, 8);
+	ultoa((unsigned long)t, str, 10);
+	uart_putstr(str);
+	
 	uart_putstr_P(PSTR("\r\n"));
 }
 /*****************************************************************************
  *  main																	 *
  *****************************************************************************/
 
-typedef void(*void_fpt)(void);
-
 int main (void){
 	char  str[20];
 	DEBUG_INIT();