X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-aes128-test.c;h=2c8e7f379e54c2ff3615fd3b706ba61eaf0f2acf;hb=6cddae4d0fa8acf9d3bfd5e0f42c789c32f3a992;hp=4bd2e9731f084c47a6c5cb06089838f2a3231fcd;hpb=7b5401ab9ce23a5da1de8b6c7de3a1aa20ac4cf8;p=avr-crypto-lib.git

diff --git a/test_src/main-aes128-test.c b/test_src/main-aes128-test.c
index 4bd2e97..2c8e7f3 100644
--- a/test_src/main-aes128-test.c
+++ b/test_src/main-aes128-test.c
@@ -26,13 +26,13 @@
 #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/bcal-performance.h"
-#include "bcal/bcal_aes128.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_aes128.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
@@ -51,14 +51,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();
+	bcal_nessie_multiple(algolist);
 }
 
 void testrun_test_aes(void){