X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-des-test.c;h=828593fa82b996758e0a0f3517a684039ac29775;hb=bcad01af2c86830bd59bd2fc719e81a7eaf2f13b;hp=349c2903d7152cf8090b2c1eb9844c9b363a8cd2;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-des-test.c b/test_src/main-des-test.c
index 349c290..828593f 100644
--- a/test_src/main-des-test.c
+++ b/test_src/main-des-test.c
@@ -22,14 +22,18 @@
 */
 
 #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_des.h"
+#include "bcal_tdes.h"
+#include "bcal_tdes2.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -37,61 +41,22 @@
 
 char* algo_name = "DES";
 
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&des_desc,
+	(bcdesc_t*)&tdes2_desc,
+	(bcdesc_t*)&tdes_desc,
+	NULL
+};
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void des_init_dummy(const void* key, uint16_t keysize_b, void* ctx){
-	memcpy(ctx, key, 8);
-}
-
-void des_enc_dummy(void* buffer, void* ctx){
-	des_enc(buffer, buffer, ctx);
-} 
-
-void des_dec_dummy(void* buffer, void* ctx){
-	des_dec(buffer, buffer, ctx);
-} 
 
 void testrun_nessie_des(void){
-	nessie_bc_init();
-	nessie_bc_ctx.blocksize_B =   8;
-	nessie_bc_ctx.keysize_b   =  64;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = 8;
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)des_enc_dummy;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)des_dec_dummy;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)des_init_dummy;
-	
-	nessie_bc_run();
+	bcal_nessie_multiple(algolist);
 }
 
-
 void testrun_performance_des(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[8], data[8];
-	
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 8);
-	memset(data, 0, 8);
-	
-	startTimer(1);
-	des_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);
-	des_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						
@@ -112,13 +77,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);
 	}
 }