removed warnings and bugs

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

diff --git a/test_src/main-rc6-test.c b/test_src/main-rc6-test.c
index aa1d897a50dc75a214a8bdf6a69abd7ce7cf35d6..e264d79001fc5afd02f522bf7ea0fb1b32937dd8 100644 (file)
--- a/test_src/main-rc6-test.c
+++ b/test_src/main-rc6-test.c
@@ -22,14 +22,16 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
+
+#include "uart_i.h"
 #include "debug.h"
 
 #include "rc6.h"
-#include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_rc6.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -38,6 +40,10 @@
 #define RC6_ROUNDS 20
 char* algo_name = "RC6-32/20/16";
 
+const bcdesc_t* algolist[] PROGMEM = {
+       (bcdesc_t*)&rc6_desc,
+       NULL
+};
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
@@ -46,67 +52,12 @@ void rc6_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
 }
 
 void testrun_nessie_rc6(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(rc6_ctx_t);
-       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)rc6_enc;
-       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)rc6_dec;
-       nessie_bc_ctx.cipher_free = (nessie_bc_free_fpt)rc6_free;
-       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)rc6_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_performance_rc6(void){
-       uint64_t t;
-       char str[16];
-       uint8_t key[16], data[16];
-       rc6_ctx_t ctx;
-       
-       calibrateTimer();
-       print_overhead();
-       
-       memset(key,  0, 16);
-       memset(data, 0, 16);
-       
-       startTimer(1);
-       rc6_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);
-       rc6_enc(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tencrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-       
-       startTimer(1);
-       rc6_dec(data, &ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tdecrypt time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-
-       startTimer(1);
-       rc6_free(&ctx);
-       t = stopTimer();
-       cli_putstr_P(PSTR("\r\n\tfree time: "));
-       ultoa((unsigned long)t, str, 10);
-       cli_putstr(str);
-       cli_putstr_P(PSTR("\r\n"));
+       bcal_performance_multiple(algolist);
 }
 /*****************************************************************************
  *  main                                                                                                                                        *
@@ -128,8 +79,8 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 int main (void){
        DEBUG_INIT();
        
-       cli_rx = uart_getc;
-       cli_tx = uart_putc;             
+       cli_rx = (cli_rx_fpt)uart0_getc;
+       cli_tx = (cli_tx_fpt)uart0_putc;                
        for(;;){
                cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
                cli_putstr(algo_name);