X-Git-Url: https://git.cryptolib.org/avr-crypto-lib.git?a=blobdiff_plain;f=test_src%2Fmain-aes256-test.c;h=a1a19dd0244275721b9a9540608a0ae97e3f391e;hb=4655b60cc205079ebafec3db4a4b47f7a8336bda;hp=6b9f0b545a6316df31b13558362cadc521f8c25c;hpb=52ec168ece9d61bd9cb652235dfe8faee6232a11;p=avr-crypto-lib.git

diff --git a/test_src/main-aes256-test.c b/test_src/main-aes256-test.c
index 6b9f0b5..a1a19dd 100644
--- a/test_src/main-aes256-test.c
+++ b/test_src/main-aes256-test.c
@@ -18,52 +18,48 @@
 */
 /*
  * AES-256 test-suit
- * 
+ *
 */
 
 #include "config.h"
-#include "serial-tools.h"
+
 #include "uart_i.h"
 #include "debug.h"
 
 #include "aes.h"
-#include "aes256_enc.h"
-#include "aes256_dec.h"
-#include "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-nessie.h"
+#include "bcal_aes256.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <avr/pgmspace.h>
 
 char* algo_name = "AES-256";
 
+const bcdesc_t* const algolist[] PROGMEM = {
+	(bcdesc_t*)&aes256_desc,
+	NULL
+};
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
 
 void testrun_nessie_aes(void){
-	nessie_bc_ctx.blocksize_B =  16;
-	nessie_bc_ctx.keysize_b   = 256;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = sizeof(aes256_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)aes256_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)aes256_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)aes_init;
-	nessie_bc_run();
+	bcal_nessie_multiple(algolist);
 }
 
 void testrun_testkey_aes256(void){
-	uint8_t key[32] = { 0x60, 0x3d, 0xeb, 0x10, 
-	                    0x15, 0xca, 0x71, 0xbe, 
-	                    0x2b, 0x73, 0xae, 0xf0, 
-	                    0x85, 0x7d, 0x77, 0x81, 
-	                    0x1f, 0x35, 0x2c, 0x07, 
-	                    0x3b, 0x61, 0x08, 0xd7, 
-	                    0x2d, 0x98, 0x10, 0xa3, 
+	uint8_t key[32] = { 0x60, 0x3d, 0xeb, 0x10,
+	                    0x15, 0xca, 0x71, 0xbe,
+	                    0x2b, 0x73, 0xae, 0xf0,
+	                    0x85, 0x7d, 0x77, 0x81,
+	                    0x1f, 0x35, 0x2c, 0x07,
+	                    0x3b, 0x61, 0x08, 0xd7,
+	                    0x2d, 0x98, 0x10, 0xa3,
 	                    0x09, 0x14, 0xdf, 0xf4};
 	aes256_ctx_t ctx;
 	uint8_t i;
@@ -85,48 +81,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);
 }
 
 /*****************************************************************************
@@ -139,7 +95,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},
@@ -150,9 +106,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);