X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=main-xtea-test.c;h=07fcffeb1eb5a2f9ad1664d922704a5a34408f1c;hb=6bca96e560e6097aa5b225fad67f2e2a27f4182f;hp=164970262fbf375c990ca860df0a5fc0c31162ac;hpb=222f3914d6308961e4e3d04ec0ea5e9ae652a1f9;p=avr-crypto-lib.git

diff --git a/main-xtea-test.c b/main-xtea-test.c
index 1649702..07fcffe 100644
--- a/main-xtea-test.c
+++ b/main-xtea-test.c
@@ -1,3 +1,21 @@
+/* main-xtea-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/>.
+*/
 /*
  * XTEA test-suit
  * 
@@ -10,6 +28,8 @@
 
 #include "xtea.h"
 #include "nessie_bc_test.h"
+#include "performance_test.h"
+#include "cli.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -28,19 +48,40 @@ void xtea_dec_dummy(uint8_t* buffer, void* ctx){
 	xtea_dec((uint32_t*)buffer, (uint32_t*)buffer, ctx);
 }
 
-void testrun_xtea(void){
-	nessie_ctx.blocksize_B =   8;
-	nessie_ctx.keysize     = 128;
-	nessie_ctx.name        = cipher_name;
-	nessie_ctx.ctx_size_B  = 128/8;
-	nessie_ctx.cipher_enc  = (nessie_enc_fpt)xtea_enc_dummy;
-	nessie_ctx.cipher_dec  = (nessie_dec_fpt)xtea_dec_dummy;
-	nessie_ctx.cipher_genctx  = (nessie_gen_fpt)xtea_genctx_dummy;
+void testrun_nessie_xtea(void){
+	nessie_bc_ctx.blocksize_B =   8;
+	nessie_bc_ctx.keysize_b   = 128;
+	nessie_bc_ctx.name        = cipher_name;
+	nessie_bc_ctx.ctx_size_B  = 128/8;
+	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)xtea_enc_dummy;
+	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)xtea_dec_dummy;
+	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)xtea_genctx_dummy;
 	
-	nessie_run();	
+	nessie_bc_run();	
 }
 
-
+void testrun_performance_xtea(void){
+	uint64_t t;
+	uint8_t key[16], data[8];
+	
+	calibrateTimer();
+	print_overhead();
+	
+	memset(key,  0, 16);
+	memset(data, 0,  8);
+	
+	startTimer(1);
+	xtea_enc(data, data, key);
+	t = stopTimer();
+	print_time_P(PSTR("\tencrypt time: "), t);
+	
+	startTimer(1);
+	xtea_dec(data, data, key);
+	t = stopTimer();
+	print_time_P(PSTR("\tdecrypt time: "), t);
+	
+	uart_putstr_P(PSTR("\r\n"));
+}
 
 /*****************************************************************************
  *  main																	 *
@@ -55,14 +96,16 @@ int main (void){
 	uart_putstr(cipher_name);
 	uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
 
-restart:
+	PGM_P    u   = PSTR("nessie\0test\0performance\0");
+	void_fpt v[] = {testrun_nessie_xtea, testrun_nessie_xtea, testrun_performance_xtea};
+
 	while(1){ 
-		if (!getnextwordn(str,20))  {DEBUG_S("DBG: W1\r\n"); goto error;}
-		if (strcmp(str, "nessie")) {DEBUG_S("DBG: 1b\r\n"); goto error;}
-			testrun_xtea();
-		goto restart;		
+		if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}
+		if(execcommand_d0_P(str, u, v)<0){
+			uart_putstr_P(PSTR("\r\nunknown command\r\n"));
+		}
 		continue;
 	error:
 		uart_putstr("ERROR\r\n");
-	}	
+	}
 }