X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=main-skipjack-test.c;h=a7f1165c697fa97bd0ccac0e9cea178b657ed47a;hb=4d76909e4282baf1420ee309e270384246b241b8;hp=9b71a56d6cf9e63be441b95fe1996f60b5dd2b8f;hpb=4d19a3429efc3bf2cb4430a7b68cafdd754b17cf;p=avr-crypto-lib.git

diff --git a/main-skipjack-test.c b/main-skipjack-test.c
index 9b71a56..a7f1165 100644
--- a/main-skipjack-test.c
+++ b/main-skipjack-test.c
@@ -1,3 +1,21 @@
+/* main-skipjack-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/>.
+*/
 /*
  * skipjack test-suit
  * 
@@ -9,14 +27,65 @@
 #include "debug.h"
 
 #include "skipjack.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 = "Skipjack";
 
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
+void skipjack_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
+	memcpy(ctx, key, 10);
+}
+
+void testrun_nessie_skipjack(void){
+	nessie_bc_ctx.blocksize_B =   8;
+	nessie_bc_ctx.keysize_b   =  80;
+	nessie_bc_ctx.name        = cipher_name;
+	nessie_bc_ctx.ctx_size_B  = 10;
+	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)skipjack_enc;
+	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)skipjack_dec;
+	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)skipjack_genctx_dummy;
+	
+	nessie_bc_run();
+}
+
+
+void testrun_performance_skipjack(void){
+	uint64_t t;
+	char str[16];
+	uint8_t key[10], data[8];
+	
+	calibrateTimer();
+	print_overhead();
+	
+	memset(key,  0, 10);
+	memset(data, 0,  8);
+	
+	startTimer(1);
+	skipjack_enc(data, key);
+	t = stopTimer();
+	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
+	ultoa((unsigned long)t, str, 10);
+	uart_putstr(str);
+	
+	
+	startTimer(1);
+	skipjack_dec(data, key);
+	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																 *
@@ -64,17 +133,18 @@ int main (void){
 
 	uart_putstr("\r\n\r\nCrypto-VS (skipjack)\r\nloaded and running\r\n");
 
-restart:
+	PGM_P    u   = PSTR("nessie\0test\0performance\0");
+	void_fpt v[] = {testrun_nessie_skipjack, testrun_skipjack, testrun_performance_skipjack};
+
 	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_skipjack();
-		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");
 	}
 	
-	
 }