X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-skipjack-test.c;h=e3f68f5d3c0010aeeb41d0473d8936d230cdd6ea;hb=701cee0d98aab48dd3192c8cc7c77eb42581bc56;hp=5a648b32bbd18c4e3752ff05491ceb61f85200e3;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c
index 5a648b3..e3f68f5 100644
--- a/test_src/main-skipjack-test.c
+++ b/test_src/main-skipjack-test.c
@@ -22,14 +22,17 @@
 */
 
 #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-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_skipjack.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -38,6 +41,10 @@
 
 char* algo_name = "Skipjack";
 
+const bcdesc_t* const algolist[] PROGMEM = {
+	(bcdesc_t*)&skipjack_desc,
+	NULL
+};
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -46,45 +53,12 @@ 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        = 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;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)skipjack_genctx_dummy;
-	
-	nessie_bc_run();
+	bcal_nessie_multiple(algolist);
 }
 
 
 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 +66,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){
@@ -142,7 +116,7 @@ const char test_str[]        PROGMEM = "test";
 const char performance_str[] PROGMEM = "performance";
 const char echo_str[]        PROGMEM = "echo";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,      NULL, testrun_nessie_skipjack},
 	{ test_str,        NULL, testrun_skipjack},
 	{ performance_str, NULL, testrun_performance_skipjack},
@@ -152,13 +126,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 int main (void){
 	DEBUG_INIT();
-	uart_putstr("\r\n");
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+	
+	cli_rx = (cli_rx_fpt)uart0_getc;
+	cli_tx = (cli_tx_fpt)uart0_putc;	 	
 	for(;;){
-		uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-		uart_putstr(algo_name);
-		uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+		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);
 	}
 }