X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-camellia-test.c;h=07907282eb45a35d3006c3a017214f0debe240e8;hb=f947a91725d102074386e84dc98d819d7f935611;hp=fb9f88170389a1f641859bca702b52d35e405a9c;hpb=6483e60140be5fe4ab60de85cdf679fc0518dc99;p=avr-crypto-lib.git

diff --git a/test_src/main-camellia-test.c b/test_src/main-camellia-test.c
index fb9f881..0790728 100644
--- a/test_src/main-camellia-test.c
+++ b/test_src/main-camellia-test.c
@@ -27,11 +27,11 @@
 #include "debug.h"
 
 #include "camellia.h"
-#include "nessie_bc_test.h"
 #include "performance_test.h"
 #include "cli.h"
 #include "bcal_camellia128.h"
 #include "bcal-performance.h"
+#include "bcal-nessie.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
@@ -39,7 +39,7 @@
 
 char* algo_name = "Camellia";
 
-const bcdesc_t* algolist[] PROGMEM = {
+const bcdesc_t* const algolist[] PROGMEM = {
 	(bcdesc_t*)&camellia128_desc,
 	NULL
 };
@@ -47,27 +47,16 @@ const bcdesc_t* algolist[] PROGMEM = {
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
-void camellia128_init_dummy(void* key, uint16_t keysize_b, void* ctx){
-	camellia128_init(key, ctx);
-}
 
 void testrun_nessie_camellia(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(camellia128_ctx_t);
-	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)camellia128_enc;
-	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)camellia128_dec;
-	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)camellia128_init_dummy;
-	
-	nessie_bc_run();
+	bcal_nessie_multiple(algolist);
 }
 
 /*
  * P No.001 : 80 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
  */
 
-uint8_t test_keys[] PROGMEM = {
+const uint8_t test_keys[] PROGMEM = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
 	0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F,
@@ -184,7 +173,7 @@ const char test128_str[]     PROGMEM = "test128";
 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_camellia },
 	{ test_str,        NULL, testrun_camellia},
 	{ test128_str,     NULL, testrun_camellia128},