X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-noekeon-test.c;h=f33f5c18f0811a69f43ef5d6d65a4cf0b9b6c3a2;hb=35dc9566e40c9f68fa216c70eaa6d5b0597448fe;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..f33f5c1 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 "nessie_bc_test.h"
-#include "cli.h"
+#include "noekeon.h"
+#include "bcal-nessie.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal_noekeon.h"
+#include "cli.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -37,52 +39,17 @@
 
 char* algo_name = "Noekeon";
 
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&noekeon_direct_desc,
+	(bcdesc_t*)&noekeon_indirect_desc,
+	NULL
+};
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void noekeon_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
-	noekeon_init(key, ctx);
-}
-
-void testrun_nessie_noekeon_indirect(void){
-	char str[strlen(algo_name)+10];
-	strcpy(str, algo_name);
-	strcat(str, "-indirect");
-	
-	nessie_bc_ctx.blocksize_B =  16;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = str;
-	nessie_bc_ctx.ctx_size_B  = sizeof(noekeon_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)noekeon_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)noekeon_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)noekeon_genctx_dummy;
-	
-	nessie_bc_run();
-}
-
-void noekeon_genctx_dummy_direct(uint8_t* key, uint16_t keysize, void* ctx){
-	memcpy(ctx, key, 16);
-}
-
-void testrun_nessie_noekeon_direct(void){
-	char str[strlen(algo_name)+10];
-	strcpy(str, algo_name);
-	strcat(str, "-Direct");
-	
-	nessie_bc_ctx.blocksize_B =  16;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = str;
-	nessie_bc_ctx.ctx_size_B  = sizeof(noekeon_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)noekeon_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)noekeon_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)noekeon_genctx_dummy_direct;
-	
-	nessie_bc_run();
-}
 
 void testrun_nessie_noekeon(void){
-	testrun_nessie_noekeon_direct();
-	testrun_nessie_noekeon_indirect();
+	bcal_nessie_multiple(algolist);
 }
 
 
@@ -90,7 +57,7 @@ void testrun_stdtest_rundirect(void* data, void* key){
 	cli_putstr_P(PSTR("\r\n                     "));
 	cli_putstr_P(PSTR("k = "));
 	cli_hexdump(key,16);
-	
+
 	cli_putstr_P(PSTR("\r\n                     "));
 	cli_putstr_P(PSTR("a = "));
 	cli_hexdump(data,16);
@@ -173,39 +140,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																	 *
@@ -221,8 +156,8 @@ const char echo_str[]        PROGMEM = "echo";
 cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ nessie_str,      NULL, testrun_nessie_noekeon},
 	{ test_str,        NULL, testrun_stdtest_noekeon},
-	{ direct_str,      NULL, testrun_nessie_noekeon_direct},
-	{ indirect_str,    NULL, testrun_nessie_noekeon_indirect},
+//	{ direct_str,      NULL, testrun_nessie_noekeon_direct},
+//	{ indirect_str,    NULL, testrun_nessie_noekeon_indirect},
 	{ performance_str, NULL, testrun_performance_noekeon},
 	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
 	{ NULL,            NULL, NULL}