X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-seed-test.c;h=d8a4ec2b253a81be4f783d52b5fc912940e3c299;hb=cc26d167f796adaa33ca3cbec8016f7915b6033b;hp=9ff4b3ff220e593123b839836634b13dfbaccec2;hpb=b8d6b2bd3ddea45506f584c7d44fe5fff0557ed1;p=avr-crypto-lib.git diff --git a/test_src/main-seed-test.c b/test_src/main-seed-test.c index 9ff4b3f..d8a4ec2 100644 --- a/test_src/main-seed-test.c +++ b/test_src/main-seed-test.c @@ -26,25 +26,19 @@ * GPLv3 or later * */ -#include "config.h" -#include "uart_i.h" -#include "debug.h" + +#include "main-test-common.h" #include "seed.h" -#include "nessie_bc_test.h" -#include "cli.h" #include "performance_test.h" #include "bcal-performance.h" +#include "bcal-nessie.h" #include "bcal_seed.h" -#include -#include -#include - char* algo_name = "Seed"; -const bcdesc_t* algolist[] PROGMEM = { +const bcdesc_t* const algolist[] PROGMEM = { (bcdesc_t*)&seed_desc, NULL }; @@ -56,16 +50,7 @@ void seed_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){ } void testrun_nessie_seed(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(seed_ctx_t); - nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)seed_enc; - nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)seed_dec; - nessie_bc_ctx.cipher_genctx = (nessie_bc_gen_fpt)seed_genctx_dummy; - - nessie_bc_run(); - + bcal_nessie_multiple(algolist); } @@ -140,7 +125,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_seed}, { test_str, NULL, testrun_seed}, { performance_str, NULL, testrun_performance_seed}, @@ -149,14 +134,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = { }; int main (void){ - DEBUG_INIT(); - - 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); - cli_putstr_P(PSTR(")\r\nloaded and running\r\n")); - cmd_interface(cmdlist); + main_setup(); + + for(;;){ + welcome_msg(algo_name); + cmd_interface(cmdlist); } }