X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-aes192-test.c;h=1274b28ab3098cae7dde2c517021e95c2c0368c0;hb=25ccd391d2f02575799e94bf9aac1e108e7c0f3b;hp=c37dc7e967b51b51d36029f4ed845162fdfe21b5;hpb=4f50c75ee5a6cc88bf7ea71957ed509e298e6c25;p=avr-crypto-lib.git

diff --git a/test_src/main-aes192-test.c b/test_src/main-aes192-test.c
index c37dc7e..1274b28 100644
--- a/test_src/main-aes192-test.c
+++ b/test_src/main-aes192-test.c
@@ -18,29 +18,33 @@
 */
 /*
  * AES-192 test-suit
- * 
+ *
 */
 
 #include "config.h"
-#include "serial-tools.h"
+
 #include "uart_i.h"
 #include "debug.h"
 
 #include "aes/aes.h"
-#include "aes/aes192_enc.h"
-#include "aes/aes192_dec.h"
-#include "aes/aes_keyschedule.h"
-
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-
+#include "blockcipher_descriptor.h"
+#include "bcal-performance.h"
+#include "bcal_aes192.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <avr/pgmspace.h>
 
 char* algo_name = "AES-192";
 
+const bcdesc_t* algolist[] PROGMEM = {
+	(bcdesc_t*)&aes192_desc,
+	NULL
+};
+
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
@@ -57,11 +61,11 @@ void testrun_nessie_aes(void){
 }
 
 void testrun_testkey_aes192(void){
-	uint8_t key[24] = { 0x8e, 0x73, 0xb0, 0xf7, 
+	uint8_t key[24] = { 0x8e, 0x73, 0xb0, 0xf7,
 	                    0xda, 0x0e, 0x64, 0x52,
-	                    0xc8, 0x10, 0xf3, 0x2b, 
-	                    0x80, 0x90, 0x79, 0xe5, 
-	                    0x62, 0xf8, 0xea, 0xd2, 
+	                    0xc8, 0x10, 0xf3, 0x2b,
+	                    0x80, 0x90, 0x79, 0xe5,
+	                    0x62, 0xf8, 0xea, 0xd2,
 	                    0x52, 0x2c, 0x6b, 0x7b};
 	aes192_ctx_t ctx;
 	uint8_t i;
@@ -83,50 +87,12 @@ void testrun_testkey_aes(void){
 }
 /*****************************************************************************/
 
-void testrun_performance_aes192(void){
-	uint64_t t;
-	char str[16];
-	uint8_t key[32], data[16];
-	aes192_ctx_t ctx;
-	
-	calibrateTimer();
-	print_overhead();
-	
-	memset(key,  0, 32);
-	memset(data, 0, 16);
-	
-	startTimer(1);
-	aes192_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);
-	aes192_enc(data, &ctx);
-	t = stopTimer();
-	cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-	ultoa((unsigned long)t, str, 10);
-	cli_putstr(str);
-	
-	
-	startTimer(1);
-	aes192_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-192\r\n"));
-	testrun_performance_aes192();
+	bcal_performance_multiple(algolist);
 }
 
+
 /*****************************************************************************
  *  main																	 *
  *****************************************************************************/
@@ -148,9 +114,9 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 
 int main (void){
 	DEBUG_INIT();
-	
+
 	cli_rx = (cli_rx_fpt)uart0_getc;
-	cli_tx = (cli_tx_fpt)uart0_putc;	 	
+	cli_tx = (cli_tx_fpt)uart0_putc;
 	for(;;){
 		cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
 		cli_putstr(algo_name);