a lot of fixes

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

diff --git a/test_src/main-cast6-test.c b/test_src/main-cast6-test.c
index 27e047892aa40b8b6c72322b9bdbde75a304ac32..bcd97744f50200846246e83096ee91f440a8dcc4 100644 (file)
--- a/test_src/main-cast6-test.c
+++ b/test_src/main-cast6-test.c
@@ -9,9 +9,11 @@
 #include "debug.h"
 
 #include "cast6.h"
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_cast6.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -20,28 +22,18 @@
 
 char* algo_name = "CAST-256";
 
+const bcdesc_t* const algolist[] PROGMEM = {
+       (bcdesc_t*)&cast6_desc,
+       NULL
+};
+
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
 
 
 void testrun_nessie_cast6(void){
-       nessie_bc_init();
-       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(cast6_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)cast6_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)cast6_dec;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)cast6_init;
-       
-       nessie_bc_run();
-       
-       nessie_bc_ctx.keysize_b   = 192;
-       nessie_bc_run();
-       
-       nessie_bc_ctx.keysize_b   = 256;
-       nessie_bc_run();
+       bcal_nessie_multiple(algolist);
 }
 
 void testrun_rfc_cast6(void){
@@ -104,39 +96,9 @@ void testrun_rfc_cast6(void){
 }
 
 void testrun_performance_cast6(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[16], data[16];
-       cast6_ctx_t ctx;
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(key,  0, 16);
-       memset(data, 0, 16);
-       
-       startTimer(1);
-       cast6_init(key, 128, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);        
-       
-       startTimer(1);
-       cast6_enc(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-       
-       startTimer(1);
-       cast6_dec(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-       cli_putstr_P(PSTR("\r\n"));
+       bcal_performance_multiple(algolist);
 }
+
 /*****************************************************************************
  *  main                                                                                                                                        *
  *****************************************************************************/
@@ -146,7 +108,7 @@ const char test_str[]        PROGMEM = "test";
 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_cast6 },
        { test_str,        NULL, testrun_rfc_cast6},
        { performance_str, NULL, testrun_performance_cast6},