X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-aes128-test.c;h=1410d92749efca0f4d0681fab0ddec11fd1f6adc;hb=bd740a03aa9137d46277a2eee05ac6be538ef69d;hp=01cf583557440443c00e1716b5d782d7e0edc01f;hpb=aa060d30f8600acb9cc5bcf9fa3d97a2fbe5ccda;p=avr-crypto-lib.git

diff --git a/test_src/main-aes128-test.c b/test_src/main-aes128-test.c
index 01cf583..1410d92 100644
--- a/test_src/main-aes128-test.c
+++ b/test_src/main-aes128-test.c
@@ -26,17 +26,26 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "aes/aes.h"
+#include "aes.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-
+#include "blockcipher_descriptor.h"
+#include "bcal-performance.h"
+#include "bcal_aes128.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <avr/pgmspace.h>
 
 char* algo_name = "AES-128";
 
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&aes128_desc,
+	NULL
+};
+
+
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -99,50 +108,11 @@ void testrun_testkey_aes128(void){
 void testrun_testkey_aes(void){
 	testrun_testkey_aes128();
 }
-/*****************************************************************************/
 
-void testrun_performance_aes128(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[32], data[16];
-	aes128_ctx_t ctx;
-
-	calibrateTimer();
-	print_overhead();
-
-	memset(key,  0, 32);
-	memset(data, 0, 16);
-
-	startTimer(1);
-	aes128_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);
-	aes128_enc(data, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-
-
-	startTimer(1);
-	aes128_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-128\r\n"));
-	testrun_performance_aes128();
+	bcal_performance_multiple(algolist);
 }
 
 /*****************************************************************************