adding Salsa20

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

diff --git a/test_src/main-tdes-test.c b/test_src/main-tdes-test.c
index ab6cd5e88bbacd9a82c8cc4d493e9e964b5dcb6f..7cad365ade8ea0a99b1f8de799234a12c048fe50 100644 (file)
--- a/test_src/main-tdes-test.c
+++ b/test_src/main-tdes-test.c
@@ -27,9 +27,12 @@
 #include "debug.h"
 
 #include "des.h"
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_tdes.h"
+#include "bcal_tdes2.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -37,61 +40,22 @@
 
 char* algo_name = "TDES";
 
+const bcdesc_t* algolist[] PROGMEM = {
+       (bcdesc_t*)&tdes_desc,
+       (bcdesc_t*)&tdes2_desc,
+       NULL
+};
+
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
-void tdes_init_dummy(const void* key, uint16_t keysize_b, void* ctx){
-       memcpy(ctx, key, 8*3);
-}
-
-void tdes_enc_dummy(void* buffer, void* ctx){
-       tdes_enc(buffer, buffer, ctx);
-} 
-
-void tdes_dec_dummy(void* buffer, void* ctx){
-       tdes_dec(buffer, buffer, ctx);
-} 
-
 void testrun_nessie_tdes(void){
-       nessie_bc_init();
-       nessie_bc_ctx.blocksize_B =   8;
-       nessie_bc_ctx.keysize_b   = 192;
-       nessie_bc_ctx.name        = algo_name;
-       nessie_bc_ctx.ctx_size_B  = sizeof(8*3);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)tdes_enc_dummy;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)tdes_dec_dummy;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)tdes_init_dummy;
-
-       nessie_bc_run();
+       bcal_nessie_multiple(algolist);
 }
 
 
 void testrun_performance_tdes(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[8*3], data[8];
-       
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(key,  0, 8*3);
-       memset(data, 0, 8);
-       
-       startTimer(1);
-       tdes_enc(data, data, key);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-       
-       startTimer(1);
-       tdes_dec(data, data, key);
-       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                                                                                                                                        *