X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-aes256-test.c;h=a1a19dd0244275721b9a9540608a0ae97e3f391e;hb=7715ef86b09869014eb5afd319e4acc2ce157b00;hp=1715026b8761c00a85f7f9b73fa91ed894b846e7;hpb=794b705a0b4dedf4eab3aabcf39f76bf9856ee3f;p=avr-crypto-lib.git

diff --git a/test_src/main-aes256-test.c b/test_src/main-aes256-test.c
index 1715026..a1a19dd 100644
--- a/test_src/main-aes256-test.c
+++ b/test_src/main-aes256-test.c
@@ -26,12 +26,12 @@
 #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>
@@ -40,7 +40,7 @@
 
 char* algo_name = "AES-256";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const algolist[] PROGMEM = {
 	(bcdesc_t*)&aes256_desc,
 	NULL
 };
@@ -49,14 +49,7 @@ const bcdesc_t* algolist[] PROGMEM = {
  *****************************************************************************/
 
 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){
@@ -102,7 +95,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_nessie_aes},
 	{ testkey_str,     NULL, testrun_testkey_aes},