X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-serpent-test.c;h=db97c86a8c967939b79a2d26f965c34703270d45;hb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;hp=b4de5f432eff11bfbf461ebceea73f9cb1243980;hpb=a15d02c94b1ce1fc9861e654e96e0ee369fe08e9;p=avr-crypto-lib.git

diff --git a/test_src/main-serpent-test.c b/test_src/main-serpent-test.c
index b4de5f4..db97c86 100644
--- a/test_src/main-serpent-test.c
+++ b/test_src/main-serpent-test.c
@@ -1,6 +1,6 @@
 /* main-serpent-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,20 +22,27 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "serpent.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_serpent.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 
-char* cipher_name = "Serpent";
+char* algo_name = "Serpent";
+
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&serpent_desc,
+	NULL
+};
 
 /*****************************************************************************
  *  additional validation-functions											 *
@@ -47,7 +54,7 @@ void serpent_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 void testrun_nessie_serpent(void){
 	nessie_bc_ctx.blocksize_B =  16;
 	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = cipher_name;
+	nessie_bc_ctx.name        = algo_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;
@@ -69,75 +76,42 @@ void testrun_test_serpent(void){
 	memset(key, 0, 16);
 	serpent_init(key, 128, &ctx);
 	for(i=0; i<33; ++i){
-		uart_putstr_P(PSTR("\r\n subkekey "));	
-		uart_hexdump(&i, 1);
-		uart_putstr_P(PSTR(" : "));	
-		uart_hexdump(ctx.k[i], 16);
+		cli_putstr_P(PSTR("\r\n subkekey "));	
+		cli_hexdump(&i, 1);
+		cli_putstr_P(PSTR(" : "));	
+		cli_hexdump(ctx.k[i], 16);
 	}
 }
 
 void testrun_performance_serpent(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[32], data[16];
-	serpent_ctx_t ctx;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 32);
-	memset(data, 0, 16);
-	
-	startTimer(1);
-	serpent_init(key, 0, &ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	
-	startTimer(1);
-	serpent_enc(data, &ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	
-	startTimer(1);
-	serpent_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"));
+	bcal_performance_multiple(algolist);
 }
 /*****************************************************************************
  *  main																	 *
  *****************************************************************************/
 
+const char nessie_str[]      PROGMEM = "nessie";
+const char test_str[]        PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[]        PROGMEM = "echo";
+
+cmdlist_entry_t cmdlist[] PROGMEM = {
+	{ nessie_str,      NULL, testrun_nessie_serpent},
+	{ test_str,        NULL, testrun_test_serpent},
+	{ performance_str, NULL, testrun_performance_serpent},
+	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
+	{ NULL,            NULL, NULL}
+};
+
 int main (void){
-	char  str[20];
 	DEBUG_INIT();
-	uart_putstr("\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_serpent, testrun_test_serpent, testrun_performance_serpent};
-
-	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");
-	}
 	
+	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);
+	}
 }
-