X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=test_src%2Fmain-rc6-test.c;h=46eff9f40f2d8658b6bc16cfc16c1ba6627cae88;hb=e9e07569721b9e005d6b602e26a03e930e796577;hp=5d7ecdac07e4f607b026134b7574da9ecbb364a3;hpb=2159c273c9d3361571a6ff1ab63d9bc76582fbab;p=avr-crypto-lib.git
diff --git a/test_src/main-rc6-test.c b/test_src/main-rc6-test.c
index 5d7ecda..46eff9f 100644
--- a/test_src/main-rc6-test.c
+++ b/test_src/main-rc6-test.c
@@ -1,7 +1,7 @@
/* main-rc6-test.c */
/*
- This file is part of the Crypto-avr-lib/microcrypt-lib.
- Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de)
+ This file is part of the AVR-Crypto-Lib.
+ Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,122 +17,62 @@
along with this program. If not, see .
*/
/*
- * rc5 test-suit
+ * rc6 test-suit
*
*/
-#include "config.h"
-#include "serial-tools.h"
-#include "uart.h"
-#include "debug.h"
+#include "main-test-common.h"
#include "rc6.h"
-#include "nessie_bc_test.h"
-#include "cli.h"
#include "performance_test.h"
-
-#include
-#include
-#include
+#include "bcal-performance.h"
+#include "bcal-nessie.h"
+#include "bcal_rc6.h"
#define RC6_ROUNDS 20
-char* cipher_name = "RC6-32/20/16";
+char *algo_name = "RC6-32/20/16";
+const bcdesc_t *const algolist[] PROGMEM = {
+ (bcdesc_t*)&rc6_desc,
+ NULL
+};
/*****************************************************************************
* additional validation-functions *
*****************************************************************************/
-void rc6_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){
+void rc6_genctx_dummy(uint8_t *key, uint16_t keysize_b, void *ctx){
rc6_initl(key, keysize_b, RC6_ROUNDS, 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 = cipher_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();
- uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
- ultoa((unsigned long)t, str, 10);
- uart_putstr(str);
-
- startTimer(1);
- rc6_enc(data, &ctx);
- t = stopTimer();
- uart_putstr_P(PSTR("\r\n\tencrypt time: "));
- ultoa((unsigned long)t, str, 10);
- uart_putstr(str);
-
- startTimer(1);
- rc6_dec(data, &ctx);
- t = stopTimer();
- uart_putstr_P(PSTR("\r\n\tdecrypt time: "));
- ultoa((unsigned long)t, str, 10);
- uart_putstr(str);
-
- startTimer(1);
- rc6_free(&ctx);
- t = stopTimer();
- uart_putstr_P(PSTR("\r\n\tfree time: "));
- ultoa((unsigned long)t, str, 10);
- uart_putstr(str);
- uart_putstr_P(PSTR("\r\n"));
+ bcal_performance_multiple(algolist);
}
/*****************************************************************************
* main *
*****************************************************************************/
-int main (void){
- char str[20];
- DEBUG_INIT();
- uart_putstr("\r\n");
+const char nessie_str[] PROGMEM = "nessie";
+const char test_str[] PROGMEM = "test";
+const char performance_str[] PROGMEM = "performance";
+const char echo_str[] PROGMEM = "echo";
- uart_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
- uart_putstr(cipher_name);
- uart_putstr_P(PSTR(")\r\nloaded and running\r\n"));
+const cmdlist_entry_t cmdlist[] PROGMEM = {
+ { nessie_str, NULL, testrun_nessie_rc6},
+ { test_str, NULL, testrun_nessie_rc6},
+ { performance_str, NULL, testrun_performance_rc6},
+ { echo_str, (void*)1, (void_fpt)echo_ctrl},
+ { NULL, NULL, NULL}
+};
- PGM_P u = PSTR("nessie\0test\0performance\0");
- void_fpt v[] = {testrun_nessie_rc6, testrun_nessie_rc6, testrun_performance_rc6};
+int main (void){
+ main_setup();
- while(1){
- if (!getnextwordn(str,20)){DEBUG_S("DBG: W1\r\n"); goto error;}
- if(execcommand_d0_P(str, u, v)<0){
- uart_putstr_P(PSTR("\r\nunknown command\r\n"));
- }
- continue;
- error:
- uart_putstr("ERROR\r\n");
+ for(;;){
+ welcome_msg(algo_name);
+ cmd_interface(cmdlist);
}
-
}
-