migration to SCAL initiated

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

diff --git a/test_src/main-aes-test.c b/test_src/main-aes-test.c
index 88f87d5b266544e165143b8f734d046b72b8473e..934d6df5090e1ecf6dec0cbfb4b24bfaee698af2 100644 (file)
--- a/test_src/main-aes-test.c
+++ b/test_src/main-aes-test.c
@@ -26,25 +26,25 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "aes/aes.h"
+#include "aes.h"
 
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
 #include "dump.h"
 
-#include "bcal/bcal_aes128.h"
-#include "bcal/bcal_aes192.h"
-#include "bcal/bcal_aes256.h"
-#include "bcal/bcal-cbc.h"
-#include "bcal/bcal-cfb_byte.h"
-#include "bcal/bcal-cfb_bit.h"
-#include "bcal/bcal-ofb.h"
-#include "bcal/bcal-ctr.h"
-#include "bcal/bcal-cmac.h"
-#include "bcal/bcal-eax.h"
+#include "bcal_aes128.h"
+#include "bcal_aes192.h"
+#include "bcal_aes256.h"
+#include "bcal-cbc.h"
+#include "bcal-cfb_byte.h"
+#include "bcal-cfb_bit.h"
+#include "bcal-ofb.h"
+#include "bcal-ctr.h"
+#include "bcal-cmac.h"
+#include "bcal-eax.h"
 #include "cmacvs.h"
-#include "bcal/bcal-performance.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -65,26 +65,7 @@ const bcdesc_t* algolist[] PROGMEM = {
  *****************************************************************************/
 
 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();
-
-       nessie_bc_ctx.keysize_b   = 192;
-       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_run();
-
-       nessie_bc_ctx.keysize_b   = 256;
-       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_run();
+       bcal_nessie_multiple(algolist);
 }
 
 void testrun_test_aes(void){