X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=main-serpent-test.c;h=b81cb32af75a9708160d1d268e65a5e2c637b78b;hb=2c2d732098455b6ef9e5908ebd75238df0b2bd4c;hp=2f0f22250313ee121d3d2106a586f42f801a4ed7;hpb=222f3914d6308961e4e3d04ec0ea5e9ae652a1f9;p=avr-crypto-lib.git

diff --git a/main-serpent-test.c b/main-serpent-test.c
index 2f0f222..b81cb32 100644
--- a/main-serpent-test.c
+++ b/main-serpent-test.c
@@ -10,9 +10,12 @@
 
 #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";
 
@@ -24,30 +27,71 @@ void serpent_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 }
 
 void testrun_nessie_serpent(void){
-	nessie_ctx.blocksize_B =  16;
-	nessie_ctx.keysize     = 128;
-	nessie_ctx.name        = cipher_name;
-	nessie_ctx.ctx_size_B  = sizeof(serpent_ctx_t);
-	nessie_ctx.cipher_enc  = (nessie_enc_fpt)serpent_enc;
-	nessie_ctx.cipher_dec  = (nessie_dec_fpt)serpent_dec;
-	nessie_ctx.cipher_genctx  = (nessie_gen_fpt)serpent_genctx_dummy;
+	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(serpent_ctx_t);
+	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)serpent_enc;
+	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)serpent_dec;
+	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)serpent_genctx_dummy;
 	
-	nessie_run();
+	nessie_bc_run();
 	
-	nessie_ctx.keysize     = 192;
-	nessie_run();
-	
-	nessie_ctx.keysize     = 256;
-	nessie_run();
+	nessie_bc_ctx.keysize_b   = 192;
+	nessie_bc_run();
 	
+	nessie_bc_ctx.keysize_b   = 256;
+	nessie_bc_run();
 }
 
 
-
+void testrun_performance_serpent(void){
+	uint16_t i,c;
+	uint64_t t;
+	char str[6];
+	uint8_t key[32], data[16];
+	serpent_ctx_t ctx;
+	
+	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, 16);
+	
+	startTimer(1);
+	serpent_genctx(key, 0, &ctx);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
+	uart_hexdump(&t, 8);
+	
+	
+	startTimer(1);
+	serpent_enc(data, &ctx);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
+	uart_hexdump(&t, 8);
+	
+	
+	startTimer(1);
+	serpent_dec(data, &ctx);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
+	uart_hexdump(&t, 8);
+	uart_putstr_P(PSTR("\r\n"));
+}
 /*****************************************************************************
  *  main																	 *
  *****************************************************************************/
 
+typedef void(*void_fpt)(void);
+
 int main (void){
 	char  str[20];
 	DEBUG_INIT();
@@ -57,12 +101,14 @@ 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_serpent, testrun_nessie_serpent, testrun_performance_serpent};
+
 	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_nessie_serpent();
-		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");