X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-aes-test.c;h=934d6df5090e1ecf6dec0cbfb4b24bfaee698af2;hb=ac564028e573ea773530e01f1e5a3fe58fcd40a0;hp=9ec7056ee6a4eac658e5c48333cdd8aa32defda4;hpb=6483e60140be5fe4ab60de85cdf679fc0518dc99;p=avr-crypto-lib.git

diff --git a/test_src/main-aes-test.c b/test_src/main-aes-test.c
index 9ec7056..934d6df 100644
--- a/test_src/main-aes-test.c
+++ b/test_src/main-aes-test.c
@@ -26,9 +26,8 @@
 #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"
@@ -45,6 +44,7 @@
 #include "bcal-eax.h"
 #include "cmacvs.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){