a lot of fixes

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

diff --git a/test_src/main-aes192-test.c b/test_src/main-aes192-test.c
index 96fbf3e5e12499f355825eac7ec3bf4c1be8fcd9..0eca624a04b000bc0bd828f7438d452e3a206f6f 100644 (file)
--- a/test_src/main-aes192-test.c
+++ b/test_src/main-aes192-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_aes192.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_aes192.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
@@ -40,7 +40,7 @@
 
 char* algo_name = "AES-192";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const algolist[] PROGMEM = {
        (bcdesc_t*)&aes192_desc,
        NULL
 };
@@ -50,14 +50,7 @@ const bcdesc_t* algolist[] PROGMEM = {
  *****************************************************************************/
 
 void testrun_nessie_aes(void){
-       nessie_bc_ctx.blocksize_B =  16;
-       nessie_bc_ctx.keysize_b   = 192;
-       nessie_bc_ctx.name        = algo_name;
-       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_ctx.cipher_genctx  = (nessie_bc_gen_fpt)aes_init;
-       nessie_bc_run();
+       bcal_nessie_multiple(algolist);
 }
 
 void testrun_testkey_aes192(void){
@@ -103,7 +96,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},