X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-aes128-test.c;h=d90c8bdd6836779a12b979b4f6e4d600222d3428;hb=4655b60cc205079ebafec3db4a4b47f7a8336bda;hp=ce9468f1c4d65c1ec70904e67b3c32c7b744e96e;hpb=302f07c97444e2f5f5560dc2fd9af58d4b591d45;p=avr-crypto-lib.git

diff --git a/test_src/main-aes128-test.c b/test_src/main-aes128-test.c
index ce9468f..d90c8bd 100644
--- a/test_src/main-aes128-test.c
+++ b/test_src/main-aes128-test.c
@@ -18,7 +18,7 @@
 */
 /*
  * AES-128 test-suit
- * 
+ *
 */
 
 #include "config.h"
@@ -26,44 +26,42 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "aes/aes.h"
-#include "aes/aes128_enc.h"
-#include "aes/aes128_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_aes128.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <avr/pgmspace.h>
 
 char* algo_name = "AES-128";
 
+const bcdesc_t* const algolist[] PROGMEM = {
+	(bcdesc_t*)&aes128_desc,
+	NULL
+};
+
+
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
 
 void testrun_nessie_aes(void){
-	nessie_bc_ctx.blocksize_B =  16;
-	nessie_bc_ctx.keysize_b   = 128;
-	nessie_bc_ctx.name        = algo_name;
-	nessie_bc_ctx.ctx_size_B  = sizeof(aes128_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)aes128_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)aes128_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)aes_init;
-	nessie_bc_run();
+	bcal_nessie_multiple(algolist);
 }
 
 void testrun_test_aes(void){
-	uint8_t key[16] = { 0x2b, 0x7e, 0x15, 0x16, 
+	uint8_t key[16] = { 0x2b, 0x7e, 0x15, 0x16,
 	                    0x28, 0xae, 0xd2, 0xa6,
 	                    0xab, 0xf7, 0x15, 0x88,
 	                    0x09, 0xcf, 0x4f, 0x3c };
 	uint8_t data[16] = { 0x32, 0x43, 0xf6, 0xa8,
-	                     0x88, 0x5a, 0x30, 0x8d, 
-	                     0x31, 0x31, 0x98, 0xa2, 
+	                     0x88, 0x5a, 0x30, 0x8d,
+	                     0x31, 0x31, 0x98, 0xa2,
 	                     0xe0, 0x37, 0x07, 0x34 };
 	aes128_ctx_t ctx;
 	aes128_init(key, &ctx);
@@ -77,12 +75,12 @@ void testrun_test_aes(void){
 	aes128_dec(data, &ctx);
 	cli_putstr_P(PSTR("\r\n plaintext:  "));
 	cli_hexdump(data, 16);
-	
-	
+
+
 }
 
 void testrun_testkey_aes128(void){
-	uint8_t key[16] = { 0x2b, 0x7e, 0x15, 0x16, 
+	uint8_t key[16] = { 0x2b, 0x7e, 0x15, 0x16,
 	                    0x28, 0xae, 0xd2, 0xa6,
 	                    0xab, 0xf7, 0x15, 0x88,
 	                    0x09, 0xcf, 0x4f, 0x3c};
@@ -103,50 +101,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);
 }
 
 /*****************************************************************************
@@ -158,7 +117,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_test_aes},
 	{ testkey_str,     NULL, testrun_testkey_aes},
@@ -166,12 +125,12 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 	{ echo_str,    (void*)1, (void_fpt)echo_ctrl},
 	{ NULL,            NULL, NULL}
 };
- 
+
 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);