X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=main-shabea-test.c;h=418bcf6fff1da329791f375e4afb92124c281ceb;hb=91bece1f7822ccaae033989525ee08f613de3802;hp=fb9c87c6b08f168cebd3b3a9530b6361aeee2168;hpb=bfac0f0eef1c956bf6fbc023708f17ecfda9b39d;p=avr-crypto-lib.git

diff --git a/main-shabea-test.c b/main-shabea-test.c
index fb9c87c..418bcf6 100644
--- a/main-shabea-test.c
+++ b/main-shabea-test.c
@@ -1,10 +1,28 @@
+/* main-shabea-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/>.
+*/
 /**
  * \file	main-shabea-test.c
  * \author	Daniel Otte 
  * \date	2007-06-07
  * \brief	test suit for SHABEA
  * \par License	
- * GPL
+ * GPLv3 or later
  * 
  */
 #include "config.h"
@@ -13,14 +31,81 @@
 #include "debug.h"
 
 #include "shabea.h"
+#include "nessie_bc_test.h"
+#include "cli.h"
+#include "performance_test.h"
 
 #include <stdint.h>
 #include <string.h>
-#include <util/delay.h>
+#include <stdlib.h>
+
+char* cipher_name = "Shabea";
 
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
+void shabea_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
+	memcpy(ctx, key, keysize);
+}
+
+void shabea_enc_dummy(void* buffer, void* ctx){
+	shabea256(buffer, ctx, 256, 1, 16);
+}
+
+void shabea_dec_dummy(void* buffer, void* ctx){
+	shabea256(buffer, ctx, 256, 0, 16);
+}
+
+
+void testrun_nessie_shabea(void){
+	nessie_bc_ctx.blocksize_B =  32;
+	nessie_bc_ctx.keysize_b   = 256;
+	nessie_bc_ctx.name        = cipher_name;
+	nessie_bc_ctx.ctx_size_B  = 32;
+	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)shabea_enc_dummy;
+	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)shabea_dec_dummy;
+	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)shabea_genctx_dummy;
+	
+	nessie_bc_run();
+}
+
+
+void testrun_performance_shabea(void){
+	uint16_t i,c;
+	uint64_t t;
+	char str[16];
+	uint8_t key[32], data[32];
+	
+	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);
+	
+	memset(key,  0, 32);
+	memset(data, 0, 32);
+	
+	startTimer(1);
+	shabea256(data, key, 256, 1, 16);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
+	ultoa((unsigned long)t, str, 10);
+	uart_putstr(str);
+	
+	
+	startTimer(1);
+	shabea256(data, key, 256, 0, 16);
+	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"));
+}
 
 /*****************************************************************************
  *  self tests																 *
@@ -31,7 +116,6 @@ void testencrypt(uint8_t* block, uint8_t* key){
 	uart_hexdump(key,16);
 	uart_putstr("\r\n plain: ");
 	uart_hexdump(block,32);
-	_delay_ms(50);
 	shabea256(block,key,128,1,16);
 	uart_putstr("\r\n crypt: ");
 	uart_hexdump(block,32);
@@ -43,7 +127,6 @@ void testdecrypt(uint8_t* block, uint8_t* key){
 	uart_hexdump(key,16);
 	uart_putstr("\r\n crypt: ");
 	uart_hexdump(block,32);
-	_delay_ms(50);
 	shabea256(block,key,128,0,16);
 	uart_putstr("\r\n plain: ");
 	uart_hexdump(block,32);
@@ -83,7 +166,6 @@ void testrun_shabea(void){
 		testencrypt(datas[i],keys[i]);
 		testdecrypt(datas[i],keys[i]);	
 	}
-//	testdecrypt(data,key);	
 }
 
 
@@ -98,19 +180,22 @@ int main (void){
 	DEBUG_INIT();
 	uart_putstr("\r\n");
 
-	uart_putstr("\r\n\r\nCrypto-VS (shabea)\r\nloaded and running\r\n");
+	uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
+	uart_putstr(cipher_name);
+	uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+
+	PGM_P    u   = PSTR("nessie\0test\0performance\0");
+	void_fpt v[] = {testrun_nessie_shabea, testrun_shabea, testrun_performance_shabea};
 
-restart:
 	while(1){ 
-		if (!getnextwordn(str,20))  {DEBUG_S("DBG: W1\r\n"); goto error;}
-		if (strcmp(str, "test")) {DEBUG_S("DBG: 1b\r\n"); goto error;}
-			testrun_shabea();
-		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");
 	}
 	
-	
 }