X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-skipjack-test.c;h=2192816a7d177af595821c1d07896f87f11c25ae;hb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;hp=68baa3a697e9a9a734de2cbe919144ff0344b078;hpb=3caccd2034e682222162e24c256d20bf65d7c649;p=avr-crypto-lib.git

diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c
index 68baa3a..2192816 100644
--- a/test_src/main-skipjack-test.c
+++ b/test_src/main-skipjack-test.c
@@ -1,6 +1,6 @@
 /* main-skipjack-test.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -22,22 +22,28 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "skipjack.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_skipjack.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 
 
-char* cipher_name = "Skipjack";
+char* algo_name = "Skipjack";
 
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&skipjack_desc,
+	NULL
+};
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -48,7 +54,7 @@ void skipjack_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 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.name        = algo_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;
@@ -59,32 +65,7 @@ void testrun_nessie_skipjack(void){
 
 
 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"));
+	bcal_performance_multiple(algolist);
 }
 
 /*****************************************************************************
@@ -92,23 +73,23 @@ void testrun_performance_skipjack(void){
  *****************************************************************************/
 
 void testencrypt(uint8_t* block, uint8_t* key){
-	uart_putstr("\r\n==testy-encrypt==\r\n key: ");
-	uart_hexdump(key,10);
-	uart_putstr("\r\n plain: ");
-	uart_hexdump(block,8);
+	cli_putstr("\r\n==testy-encrypt==\r\n key: ");
+	cli_hexdump(key,10);
+	cli_putstr("\r\n plain: ");
+	cli_hexdump(block,8);
 	skipjack_enc(block,key);
-	uart_putstr("\r\n crypt: ");
-	uart_hexdump(block,8);
+	cli_putstr("\r\n crypt: ");
+	cli_hexdump(block,8);
 }
 
 void testdecrypt(uint8_t* block, uint8_t* key){
-	uart_putstr("\r\n==testy-decrypt==\r\n key: ");
-	uart_hexdump(key,10);
-	uart_putstr("\r\n crypt: ");
-	uart_hexdump(block,8);
+	cli_putstr("\r\n==testy-decrypt==\r\n key: ");
+	cli_hexdump(key,10);
+	cli_putstr("\r\n crypt: ");
+	cli_hexdump(block,8);
 	skipjack_dec(block,key);
-	uart_putstr("\r\n plain: ");
-	uart_hexdump(block,8);
+	cli_putstr("\r\n plain: ");
+	cli_hexdump(block,8);
 }
 
 void testrun_skipjack(void){
@@ -137,26 +118,28 @@ void testrun_skipjack(void){
  *  main																	 *
  *****************************************************************************/
 
-int main (void){
-	char str[20];
-
-	DEBUG_INIT();
-	uart_putstr("\r\n");
-
-	uart_putstr("\r\n\r\nCrypto-VS (skipjack)\r\nloaded and running\r\n");
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
 
-	PGM_P    u   = PSTR("nessie\0test\0performance\0");
-	void_fpt v[] = {testrun_nessie_skipjack, testrun_skipjack, testrun_performance_skipjack};
+cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,      NULL, testrun_nessie_skipjack},
+	{ test_str,        NULL, testrun_skipjack},
+	{ performance_str, NULL, testrun_performance_skipjack},
+	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
+	{ NULL,            NULL, NULL}
+};
 
-	while(1){ 
-		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");
-	}
+int main (void){
+	DEBUG_INIT();
 	
+	cli_rx = (cli_rx_fpt)uart0_getc;
+	cli_tx = (cli_tx_fpt)uart0_putc;	 	
+	for(;;){
+		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
+		cli_putstr(algo_name);
+		cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+		cmd_interface(cmdlist);
+	}
 }
-