X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-rc6-test.c;h=2c77bea450040d8c4f46d4dd59eb9ed8a2f7f7e4;hb=b97b5aeaa3569443d9b95a77a388c6615b33f9e3;hp=0b1dc7bcf96a9ab866c5e083cfc2992d9d9f06b5;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-rc6-test.c b/test_src/main-rc6-test.c
index 0b1dc7b..2c77bea 100644
--- a/test_src/main-rc6-test.c
+++ b/test_src/main-rc6-test.c
@@ -22,14 +22,16 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "rc6.h"
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_rc6.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -38,6 +40,10 @@
 #define RC6_ROUNDS 20
 char* algo_name = "RC6-32/20/16";
 
+const bcdesc_t* const algolist[] PROGMEM = {
+	(bcdesc_t*)&rc6_desc,
+	NULL
+};
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -46,67 +52,12 @@ void rc6_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
 }
 
 void testrun_nessie_rc6(void){
-	nessie_bc_init();
-	nessie_bc_ctx.blocksize_B =  16;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = sizeof(rc6_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)rc6_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)rc6_dec;
-	nessie_bc_ctx.cipher_free = (nessie_bc_free_fpt)rc6_free;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)rc6_init;
-	
-	nessie_bc_run();
-	
-	nessie_bc_ctx.keysize_b   = 192;
-	nessie_bc_run();
-	
-	nessie_bc_ctx.keysize_b   = 256;
-	nessie_bc_run();
-	
+	bcal_nessie_multiple(algolist);
 }
 
 
 void testrun_performance_rc6(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[16], data[16];
-	rc6_ctx_t ctx;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 16);
-	memset(data, 0, 16);
-	
-	startTimer(1);
-	rc6_init(key, 128, &ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);	
-	
-	startTimer(1);
-	rc6_enc(data, &ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	startTimer(1);
-	rc6_dec(data, &ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-
-	startTimer(1);
-	rc6_free(&ctx);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tfree time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	uart_putstr_P(PSTR("\r\n"));
+	bcal_performance_multiple(algolist);
 }
 /*****************************************************************************
  *  main																	 *
@@ -117,7 +68,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_rc6},
 	{ test_str,        NULL, testrun_nessie_rc6},
 	{ performance_str, NULL, testrun_performance_rc6},
@@ -127,13 +78,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);
 	}
 }