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

diff --git a/test_src/main-tdes-test.c b/test_src/main-tdes-test.c
index f32c972..7490329 100644
--- a/test_src/main-tdes-test.c
+++ b/test_src/main-tdes-test.c
@@ -22,14 +22,17 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "des.h"
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_tdes.h"
+#include "bcal_tdes2.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -37,61 +40,22 @@
 
 char* algo_name = "TDES";
 
+const bcdesc_t* const algolist[] PROGMEM = {
+	(bcdesc_t*)&tdes_desc,
+	(bcdesc_t*)&tdes2_desc,
+	NULL
+};
+
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void tdes_init_dummy(const void* key, uint16_t keysize_b, void* ctx){
-	memcpy(ctx, key, 8*3);
-}
-
-void tdes_enc_dummy(void* buffer, void* ctx){
-	tdes_enc(buffer, buffer, ctx);
-} 
-
-void tdes_dec_dummy(void* buffer, void* ctx){
-	tdes_dec(buffer, buffer, ctx);
-} 
-
 void testrun_nessie_tdes(void){
-	nessie_bc_init();
-	nessie_bc_ctx.blocksize_B =   8;
-	nessie_bc_ctx.keysize_b   = 192;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = sizeof(8*3);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)tdes_enc_dummy;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)tdes_dec_dummy;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)tdes_init_dummy;
-
-	nessie_bc_run();
+	bcal_nessie_multiple(algolist);
 }
 
 
 void testrun_performance_tdes(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[8*3], data[8];
-	
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 8*3);
-	memset(data, 0, 8);
-	
-	startTimer(1);
-	tdes_enc(data, data, key);
-	t = stopTimer();
-	uart_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	uart_putstr(str);
-	
-	startTimer(1);
-	tdes_dec(data, 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);
 }
 /*****************************************************************************
  *  main																	 *
@@ -102,7 +66,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_tdes},
 	{ test_str,        NULL, testrun_nessie_tdes},
 	{ performance_str, NULL, testrun_performance_tdes},
@@ -112,13 +76,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);
 	}
 }