X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-present-test.c;h=1b981fa720a1097fd509ffe2033d38553858c181;hb=cc6b183296a5852449e3324737e2a2dece788786;hp=b2371b80b620080ffe66b6f3da416ba22de809d7;hpb=83d0614d8b17eac97f891f7de2bb3ef265751dea;p=avr-crypto-lib.git

diff --git a/test_src/main-present-test.c b/test_src/main-present-test.c
index b2371b8..1b981fa 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* const algolist[] PROGMEM = {
+	(bcdesc_t*)&present_desc,
+	NULL
+};
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -45,15 +51,7 @@ 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){
@@ -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);
-	
-	cli_putstr_P(PSTR("\r\n"));
+	bcal_performance_multiple(algolist);
 }
 
 /*****************************************************************************
@@ -132,7 +105,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_present},
 	{ test_str,        NULL, testrun_self_present},
 	{ performance_str, NULL, testrun_performance_present},
@@ -143,8 +116,8 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 int main (void){
 	DEBUG_INIT();
 	
-	cli_rx = uart_getc;
-	cli_tx = uart_putc;	 	
+	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);