X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-aes256-test.c;h=68a82acef40757b708402d1cf6fed91f92a56524;hb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;hp=d75fc526bcde4bf4126b1cc09f1cd0c091a760a1;hpb=aa060d30f8600acb9cc5bcf9fa3d97a2fbe5ccda;p=avr-crypto-lib.git

diff --git a/test_src/main-aes256-test.c b/test_src/main-aes256-test.c
index d75fc52..68a82ac 100644
--- a/test_src/main-aes256-test.c
+++ b/test_src/main-aes256-test.c
@@ -27,17 +27,23 @@
 #include "debug.h"
 
 #include "aes/aes.h"
-
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-
+#include "blockcipher_descriptor.h"
+#include "bcal/bcal-performance.h"
+#include "bcal/bcal_aes256.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <avr/pgmspace.h>
 
 char* algo_name = "AES-256";
 
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&aes256_desc,
+	NULL
+};
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -82,48 +88,8 @@ void testrun_testkey_aes(void){
 }
 /*****************************************************************************/
 
-void testrun_performance_aes256(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[32], data[16];
-	aes256_ctx_t ctx;
-
-	calibrateTimer();
-	print_overhead();
-
-	memset(key,  0, 32);
-	memset(data, 0, 16);
-
-	startTimer(1);
-	aes256_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);
-	aes256_enc(data, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-
-
-	startTimer(1);
-	aes256_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"));
-}
-
 void testrun_performance_aes(void){
-	cli_putstr_P(PSTR("\r\n -=AES Performance Test=-\r\n"));
-	cli_putstr_P(PSTR("\r\n       AES-256\r\n"));
-	testrun_performance_aes256();
+	bcal_performance_multiple(algolist);
 }
 
 /*****************************************************************************