X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-serpent-test.c;h=ec456d66ebaa2a6876e7b0ed7dac37d2b08ea27e;hb=9aebf1891ebd2ab61830988a176e8a9da974d93a;hp=896d879b22afac2211a81eb67e869b5e4fe37f43;hpb=302f07c97444e2f5f5560dc2fd9af58d4b591d45;p=avr-crypto-lib.git

diff --git a/test_src/main-serpent-test.c b/test_src/main-serpent-test.c
index 896d879..ec456d6 100644
--- a/test_src/main-serpent-test.c
+++ b/test_src/main-serpent-test.c
@@ -27,9 +27,11 @@
 #include "debug.h"
 
 #include "serpent.h"
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_serpent.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -37,6 +39,11 @@
 
 char* algo_name = "Serpent";
 
+const bcdesc_t* const algolist[] PROGMEM = {
+	(bcdesc_t*)&serpent_desc,
+	NULL
+};
+
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -45,21 +52,7 @@ void serpent_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 }
 
 void testrun_nessie_serpent(void){
-	nessie_bc_ctx.blocksize_B =  16;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = sizeof(serpent_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)serpent_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)serpent_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)serpent_genctx_dummy;
-	
-	nessie_bc_run();
-	
-	nessie_bc_ctx.keysize_b   = 192;
-	nessie_bc_run();
-	
-	nessie_bc_ctx.keysize_b   = 256;
-	nessie_bc_run();
+	bcal_nessie_multiple(algolist);
 }
 
 void testrun_test_serpent(void){
@@ -77,41 +70,7 @@ void testrun_test_serpent(void){
 }
 
 void testrun_performance_serpent(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[32], data[16];
-	serpent_ctx_t ctx;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 32);
-	memset(data, 0, 16);
-	
-	startTimer(1);
-	serpent_init(key, 0, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	
-	startTimer(1);
-	serpent_enc(data, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	
-	startTimer(1);
-	serpent_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																	 *
@@ -122,7 +81,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_serpent},
 	{ test_str,        NULL, testrun_test_serpent},
 	{ performance_str, NULL, testrun_performance_serpent},