X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-xtea-test.c;h=99a8eb72b627cd808b1e7d72672df9dd7d56939e;hb=6cddae4d0fa8acf9d3bfd5e0f42c789c32f3a992;hp=aaebdf35d72476d97c0eca03f1fbf461fc07f6d1;hpb=302f07c97444e2f5f5560dc2fd9af58d4b591d45;p=avr-crypto-lib.git

diff --git a/test_src/main-xtea-test.c b/test_src/main-xtea-test.c
index aaebdf3..99a8eb7 100644
--- a/test_src/main-xtea-test.c
+++ b/test_src/main-xtea-test.c
@@ -29,6 +29,9 @@
 #include "xtea.h"
 #include "nessie_bc_test.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_xtea.h"
 #include "cli.h"
 
 #include <stdint.h>
@@ -36,51 +39,19 @@
 
 char* algo_name = "XTEA";
 
-void xtea_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
-	memcpy(ctx, key, (keysize+7)/8);
-}
-
-void xtea_enc_dummy(uint8_t* buffer, void* ctx){
-	xtea_enc((uint32_t*)buffer, (uint32_t*)buffer, ctx);
-}
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&xtea_desc,
+	NULL
+};
 
-void xtea_dec_dummy(uint8_t* buffer, void* ctx){
-	xtea_dec((uint32_t*)buffer, (uint32_t*)buffer, ctx);
-}
+/******************************************************************************/
 
 void testrun_nessie_xtea(void){
-	nessie_bc_ctx.blocksize_B =   8;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = 128/8;
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)xtea_enc_dummy;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)xtea_dec_dummy;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)xtea_genctx_dummy;
-	
-	nessie_bc_run();	
+	bcal_nessie_multiple(algolist);
 }
 
 void testrun_performance_xtea(void){
-	uint64_t t;
-	uint8_t key[16], data[8];
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 16);
-	memset(data, 0,  8);
-	
-	startTimer(1);
-	xtea_enc(data, data, key);
-	t = stopTimer();
-	print_time_P(PSTR("\tencrypt time: "), t);
-	
-	startTimer(1);
-	xtea_dec(data, data, key);
-	t = stopTimer();
-	print_time_P(PSTR("\tdecrypt time: "), t);
-	
-	cli_putstr_P(PSTR("\r\n"));
+	bcal_performance_multiple(algolist);
 }
 
 /*****************************************************************************