X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-present-test.c;h=b4e5b4967ca6b88f1fc303fdb07c858d0e5868c3;hb=d1181933dc28db92d787cf5604e2fc96ab0d8f9f;hp=7f20922e6196e7b896ab2d17254c2886036921cb;hpb=572b35bb7409fb362441e0812cb62eab9f2411f0;p=avr-crypto-lib.git

diff --git a/test_src/main-present-test.c b/test_src/main-present-test.c
index 7f20922..b4e5b49 100644
--- a/test_src/main-present-test.c
+++ b/test_src/main-present-test.c
@@ -22,14 +22,16 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include <present.h>
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_present.h"
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -37,6 +39,10 @@
 
 char* algo_name = "Present";
 
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&present_desc,
+	NULL
+};
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -45,36 +51,28 @@ void present_genctx_dummy(uint8_t* key, uint16_t keysize_b, present_ctx_t* ctx){
 }
 
 void testrun_nessie_present(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  = sizeof(present_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)present_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)present_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)present_genctx_dummy;
-	
-	nessie_bc_run();	
+	bcal_nessie_multiple(algolist);
 }
 
 void testrun_selfenc(uint8_t* key, uint8_t* buffer){
 	present_ctx_t ctx;
-	uart_putstr_P(PSTR("\r\nkey   : "));
-	uart_hexdump(key, 10);
-	uart_putstr_P(PSTR("\r\nplain : "));
-	uart_hexdump(buffer, 8);
+	cli_putstr_P(PSTR("\r\nkey   : "));
+	cli_hexdump(key, 10);
+	cli_putstr_P(PSTR("\r\nplain : "));
+	cli_hexdump(buffer, 8);
 	present_init(key, 80, &ctx);
 	present_enc(buffer, &ctx);
-	uart_putstr_P(PSTR("\r\ncipher: "));
-	uart_hexdump(buffer, 8);
+	cli_putstr_P(PSTR("\r\ncipher: "));
+	cli_hexdump(buffer, 8);
 	present_dec(buffer, &ctx);
-	uart_putstr_P(PSTR("\r\nplain : "));
-	uart_hexdump(buffer, 8);
-	uart_putstr_P(PSTR("\r\n"));
+	cli_putstr_P(PSTR("\r\nplain : "));
+	cli_hexdump(buffer, 8);
+	cli_putstr_P(PSTR("\r\n"));
 }
 
 void testrun_self_present(void){
 	uint8_t buffer[8], key[10];
-	uart_putstr_P(PSTR("\r\n\r\n=== Testvectors from the paper ===\r\n"));
+	cli_putstr_P(PSTR("\r\n\r\n=== Testvectors from the paper ===\r\n"));
 	
 	memset(buffer, 0, 8);
 	memset(key, 0, 10);
@@ -95,32 +93,7 @@ void testrun_self_present(void){
 }
 
 void testrun_performance_present(void){
-	uint64_t t;
-	uint8_t key[10], data[8];
-	present_ctx_t ctx;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 10);
-	memset(data, 0,  8);
-	
-	startTimer(1);
-	present_init(key, 80, &ctx);
-	t = stopTimer();
-	print_time_P(PSTR("\tctx-gen time: "),t);
-	
-	startTimer(1);
-	present_enc(data, &ctx);
-	t = stopTimer();
-	print_time_P(PSTR("\tencrypt time: "), t);
-	
-	startTimer(1);
-	present_dec(data, &ctx);
-	t = stopTimer();
-	print_time_P(PSTR("\tdecrypt time: "), t);
-	
-	uart_putstr_P(PSTR("\r\n"));
+	bcal_performance_multiple(algolist);
 }
 
 /*****************************************************************************
@@ -142,13 +115,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);
 	}
 }