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

diff --git a/main-serpent-test.c b/main-serpent-test.c
index c05ef17..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
  * 
@@ -11,9 +29,11 @@
 #include "serpent.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
+#include "performance_test.h"
 
 #include <stdint.h>
 #include <string.h>
+#include <stdlib.h>
 
 char* cipher_name = "Serpent";
 
@@ -21,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){
@@ -43,13 +63,47 @@ void testrun_nessie_serpent(void){
 }
 
 
-
+void testrun_performance_serpent(void){
+	uint64_t t;
+	char str[16];
+	uint8_t key[32], data[16];
+	serpent_ctx_t ctx;
+	
+	calibrateTimer();
+	print_overhead();
+	
+	memset(key,  0, 32);
+	memset(data, 0, 16);
+	
+	startTimer(1);
+	serpent_init(key, 0, &ctx);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
+	ultoa((unsigned long)t, str, 10);
+	uart_putstr(str);
+	
+	
+	startTimer(1);
+	serpent_enc(data, &ctx);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
+	ultoa((unsigned long)t, str, 10);
+	uart_putstr(str);
+	
+	
+	startTimer(1);
+	serpent_dec(data, &ctx);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
+	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();
@@ -59,8 +113,8 @@ int main (void){
 	uart_putstr(cipher_name);
 	uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
 
-	PGM_P    u   = PSTR("nessie\0test\0");
-	void_fpt v[] = {testrun_nessie_serpent, testrun_nessie_serpent};
+	PGM_P    u   = PSTR("nessie\0test\0performance\0");
+	void_fpt v[] = {testrun_nessie_serpent, testrun_nessie_serpent, testrun_performance_serpent};
 
 	while(1){ 
 		if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}