adding Salsa20

[avr-crypto-lib.git] / test_src / main-aes256-test.c

diff --git a/test_src/main-aes256-test.c b/test_src/main-aes256-test.c
index d75fc526bcde4bf4126b1cc09f1cd0c091a760a1..60258938b4112bb3aebb54cbdddfe701c3ed74ef 100644 (file)
--- a/test_src/main-aes256-test.c
+++ b/test_src/main-aes256-test.c
@@ -26,31 +26,30 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "aes/aes.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_aes256.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
+#include <avr/pgmspace.h>
 
 char* algo_name = "AES-256";
 
+const bcdesc_t* 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){
@@ -82,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);
 }
 
 /*****************************************************************************