X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-aes192-test.c;h=0eca624a04b000bc0bd828f7438d452e3a206f6f;hb=44bd9d38e15d4b03486f4cf52dd9bbf2f97e6e17;hp=850d773956e0311d7d4aed76b6c8f7ec2f207434;hpb=302f07c97444e2f5f5560dc2fd9af58d4b591d45;p=avr-crypto-lib.git

diff --git a/test_src/main-aes192-test.c b/test_src/main-aes192-test.c
index 850d773..0eca624 100644
--- a/test_src/main-aes192-test.c
+++ b/test_src/main-aes192-test.c
@@ -18,7 +18,7 @@
 */
 /*
  * AES-192 test-suit
- * 
+ *
 */
 
 #include "config.h"
@@ -26,42 +26,39 @@
 #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 "aes.h"
 #include "cli.h"
 #include "performance_test.h"
-
+#include "blockcipher_descriptor.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.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* const algolist[] PROGMEM = {
+	(bcdesc_t*)&aes192_desc,
+	NULL
+};
+
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
 
 void testrun_nessie_aes(void){
-	nessie_bc_ctx.blocksize_B =  16;
-	nessie_bc_ctx.keysize_b   = 192;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = sizeof(aes192_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)aes192_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)aes192_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)aes_init;
-	nessie_bc_run();
+	bcal_nessie_multiple(algolist);
 }
 
 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 +80,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																	 *
  *****************************************************************************/
@@ -137,7 +96,7 @@ const char testkey_str[]     PROGMEM = "testkey";
 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_aes },
 	{ test_str,        NULL, testrun_nessie_aes},
 	{ testkey_str,     NULL, testrun_testkey_aes},
@@ -148,9 +107,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);