X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=main-seed-test.c;h=678d132a48828ef36cb2a47f8e9e79a25a0ee9ba;hb=4d76909e4282baf1420ee309e270384246b241b8;hp=6bff1d55d55f25b87c57475c2736a655f415bc30;hpb=96ebafd201c9e8441c7677577b24aa402c1defc6;p=avr-crypto-lib.git

diff --git a/main-seed-test.c b/main-seed-test.c
index 6bff1d5..678d132 100644
--- a/main-seed-test.c
+++ b/main-seed-test.c
@@ -18,11 +18,12 @@
 */
 /**
  * \file	main-seed-test.c
- * \author	Daniel Otte 
+ * \author	Daniel Otte
+ * \email	daniel.otte@rub.de
  * \date	2007-06-01
  * \brief	test suit for SEED
  * \par License	
- * GPL
+ * GPLv3 or later
  * 
  */
 #include "config.h"
@@ -31,14 +32,74 @@
 #include "debug.h"
 
 #include "seed.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 = "Seed";
 
 /*****************************************************************************
  *  additional validation-functions                                          *
  *****************************************************************************/
+void seed_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
+	seed_init(key, ctx);
+}
+
+void testrun_nessie_seed(void){
+	nessie_bc_ctx.blocksize_B =  16;
+	nessie_bc_ctx.keysize_b   = 128;
+	nessie_bc_ctx.name        = cipher_name;
+	nessie_bc_ctx.ctx_size_B  = sizeof(seed_ctx_t);
+	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)seed_enc;
+	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)seed_dec;
+	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)seed_genctx_dummy;
+	
+	nessie_bc_run();
+	
+}
+
+
+void testrun_performance_seed(void){
+	uint64_t t;
+	char str[16];
+	uint8_t key[16], data[16];
+	seed_ctx_t ctx;
+	
+	calibrateTimer();
+	print_overhead();
+	
+	memset(key,  0, 16);
+	memset(data, 0, 16);
+	
+	startTimer(1);
+	seed_init(key, &ctx);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
+	ultoa((unsigned long)t, str, 10);
+	uart_putstr(str);
+	
+	
+	startTimer(1);
+	seed_enc(data, &ctx);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
+	ultoa((unsigned long)t, str, 10);
+	uart_putstr(str);
+	
+	
+	startTimer(1);
+	seed_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"));
+}
 
 /*****************************************************************************
  *  self tests                                                               *
@@ -48,30 +109,24 @@ void testencrypt(uint8_t* block, uint8_t* key){
 	seed_ctx_t ctx;
 	uart_putstr("\r\n==testy-encrypt==\r\n key: ");
 	uart_hexdump(key,16);
-	seed_init(&ctx, key);
+	seed_init(key, &ctx);
 	uart_putstr("\r\n plain: ");
 	uart_hexdump(block,16);
-	_delay_ms(50);
-	seed_encrypt(&ctx, block);
+	seed_enc(block, &ctx);
 	uart_putstr("\r\n crypt: ");
 	uart_hexdump(block,16);
-//	uart_putstr("\r\n post-state: ");
-//	uart_hexdump(ctx.k,16);
 }
 
 void testdecrypt(uint8_t* block, uint8_t* key){
 	seed_ctx_t ctx;
 	uart_putstr("\r\n==testy-decrypt==\r\n key: ");
 	uart_hexdump(key,16);
-	seed_init(&ctx, key);
+	seed_init(key, &ctx);
 	uart_putstr("\r\n crypt: ");
 	uart_hexdump(block,16);
-	_delay_ms(50);
-	seed_decrypt(&ctx, block);
+	seed_dec(block, &ctx);
 	uart_putstr("\r\n plain: ");
 	uart_hexdump(block,16);
-//	uart_putstr("\r\n post-state: ");
-//	uart_hexdump(ctx.k,16);
 }
 
 void testrun_seed(void){
@@ -100,7 +155,6 @@ void testrun_seed(void){
 		testencrypt(datas[i],keys[i]);
 		testdecrypt(datas[i],keys[i]);	
 	}
-//	testdecrypt(data,key);	
 }
 
 
@@ -113,21 +167,23 @@ int main (void){
 	char str[20];
 
 	DEBUG_INIT();
-	uart_putstr("\r\n");
 
-	uart_putstr("\r\n\r\nCrypto-VS (seed)\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_seed, testrun_seed, testrun_performance_seed};
 
-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_seed();
-		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");
 	}
 	
-	
 }