X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-noekeon-test.c;h=f19a91ca0ad0fd7d39ff19c6997e624c33b6c9bf;hb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;hp=fa0c3238cc035c7d5691b7252121e1fb2d813b61;hpb=302f07c97444e2f5f5560dc2fd9af58d4b591d45;p=avr-crypto-lib.git

diff --git a/test_src/main-noekeon-test.c b/test_src/main-noekeon-test.c
index fa0c323..f19a91c 100644
--- a/test_src/main-noekeon-test.c
+++ b/test_src/main-noekeon-test.c
@@ -26,10 +26,12 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include <noekeon.h>
+#include <noekeon/noekeon.h>
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_noekeon.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -37,6 +39,11 @@
 
 char* algo_name = "Noekeon";
 
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&noekeon_direct_desc,
+	(bcdesc_t*)&noekeon_indirect_desc,
+	NULL
+};
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -173,39 +180,7 @@ void testrun_stdtest_noekeon(void){
 }
 
 void testrun_performance_noekeon(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[16], data[16];
-	noekeon_ctx_t ctx;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 16);
-	memset(data, 0, 16);
-	
-	startTimer(1);
-	noekeon_init(key, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);	
-	
-	startTimer(1);
-	noekeon_enc(data, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);	
-	
-	startTimer(1);
-	noekeon_dec(data, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	cli_putstr_P(PSTR("\r\n"));
+	bcal_performance_multiple(algolist);
 }
 /*****************************************************************************
  *  main																	 *