X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-seed-test.c;h=ca9dbb9703ccae11182a830060cf60f7c307fbea;hb=2c909fca2a13cd76a526515bda5d0292483d7a55;hp=678d132a48828ef36cb2a47f8e9e79a25a0ee9ba;hpb=2159c273c9d3361571a6ff1ab63d9bc76582fbab;p=avr-crypto-lib.git diff --git a/test_src/main-seed-test.c b/test_src/main-seed-test.c index 678d132..ca9dbb9 100644 --- a/test_src/main-seed-test.c +++ b/test_src/main-seed-test.c @@ -1,6 +1,6 @@ /* main-seed-test.c */ /* - This file is part of the Crypto-avr-lib/microcrypt-lib. + This file is part of the AVR-Crypto-Lib. Copyright (C) 2008 Daniel Otte (daniel.otte@rub.de) This program is free software: you can redistribute it and/or modify @@ -26,130 +26,87 @@ * GPLv3 or later * */ -#include "config.h" -#include "serial-tools.h" -#include "uart.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* cipher_name = "Seed"; +char *algo_name = "Seed"; +const bcdesc_t *const algolist[] PROGMEM = { + (bcdesc_t*)&seed_desc, + NULL +}; /***************************************************************************** * additional validation-functions * *****************************************************************************/ -void seed_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){ +void seed_genctx_dummy(uint8_t *key, uint16_t keysize, void *ctx){ seed_init(key, ctx); } void testrun_nessie_seed(void){ - 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(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); } void testrun_performance_seed(void){ - uint64_t t; - char str[16]; - uint8_t key[16], data[16]; - seed_ctx_t ctx; - - calibrateTimer(); - print_overhead(); - - memset(key, 0, 16); - memset(data, 0, 16); - - startTimer(1); - seed_init(key, &ctx); - t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tctx-gen time: ")); - ultoa((unsigned long)t, str, 10); - uart_putstr(str); - - - startTimer(1); - seed_enc(data, &ctx); - t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tencrypt time: ")); - ultoa((unsigned long)t, str, 10); - uart_putstr(str); - - - startTimer(1); - seed_dec(data, &ctx); - t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tdecrypt time: ")); - ultoa((unsigned long)t, str, 10); - uart_putstr(str); - - uart_putstr_P(PSTR("\r\n")); + bcal_performance_multiple(algolist); } /***************************************************************************** * self tests * *****************************************************************************/ -void testencrypt(uint8_t* block, uint8_t* key){ +void testencrypt(uint8_t *block, uint8_t *key){ seed_ctx_t ctx; - uart_putstr("\r\n==testy-encrypt==\r\n key: "); - uart_hexdump(key,16); + cli_putstr("\r\n==testy-encrypt==\r\n key: "); + cli_hexdump(key,16); seed_init(key, &ctx); - uart_putstr("\r\n plain: "); - uart_hexdump(block,16); + cli_putstr("\r\n plain: "); + cli_hexdump(block,16); seed_enc(block, &ctx); - uart_putstr("\r\n crypt: "); - uart_hexdump(block,16); + cli_putstr("\r\n crypt: "); + cli_hexdump(block,16); } -void testdecrypt(uint8_t* block, uint8_t* key){ +void testdecrypt(uint8_t *block, uint8_t *key){ seed_ctx_t ctx; - uart_putstr("\r\n==testy-decrypt==\r\n key: "); - uart_hexdump(key,16); + cli_putstr("\r\n==testy-decrypt==\r\n key: "); + cli_hexdump(key,16); seed_init(key, &ctx); - uart_putstr("\r\n crypt: "); - uart_hexdump(block,16); + cli_putstr("\r\n crypt: "); + cli_hexdump(block,16); seed_dec(block, &ctx); - uart_putstr("\r\n plain: "); - uart_hexdump(block,16); + cli_putstr("\r\n plain: "); + cli_hexdump(block,16); } void testrun_seed(void){ uint8_t keys[4][16]= - { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, - { 0x47, 0x06, 0x48, 0x08, 0x51, 0xE6, 0x1B, 0xE8, - 0x5D, 0x74, 0xBF, 0xB3, 0xFD, 0x95, 0x61, 0x85 }, - { 0x28, 0xDB, 0xC3, 0xBC, 0x49, 0xFF, 0xD8, 0x7D, - 0xCF, 0xA5, 0x09, 0xB1, 0x1D, 0x42, 0x2B, 0xE7,} - }; + { { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + { 0x47, 0x06, 0x48, 0x08, 0x51, 0xE6, 0x1B, 0xE8, + 0x5D, 0x74, 0xBF, 0xB3, 0xFD, 0x95, 0x61, 0x85 }, + { 0x28, 0xDB, 0xC3, 0xBC, 0x49, 0xFF, 0xD8, 0x7D, + 0xCF, 0xA5, 0x09, 0xB1, 0x1D, 0x42, 0x2B, 0xE7,} + }; uint8_t datas[4][16]= - { { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, - 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, - { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, - { 0x83, 0xA2, 0xF8, 0xA2, 0x88, 0x64, 0x1F, 0xB9, - 0xA4, 0xE9, 0xA5, 0xCC, 0x2F, 0x13, 0x1C, 0x7D }, - { 0xB4, 0x1E, 0x6B, 0xE2, 0xEB, 0xA8, 0x4A, 0x14, - 0x8E, 0x2E, 0xED, 0x84, 0x59, 0x3C, 0x5E, 0xC7 } - }; + { { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, + { 0x83, 0xA2, 0xF8, 0xA2, 0x88, 0x64, 0x1F, 0xB9, + 0xA4, 0xE9, 0xA5, 0xCC, 0x2F, 0x13, 0x1C, 0x7D }, + { 0xB4, 0x1E, 0x6B, 0xE2, 0xEB, 0xA8, 0x4A, 0x14, + 0x8E, 0x2E, 0xED, 0x84, 0x59, 0x3C, 0x5E, 0xC7 } + }; uint8_t i=0; for(i=0; i<4; ++i){ testencrypt(datas[i],keys[i]); @@ -163,27 +120,24 @@ void testrun_seed(void){ * main * *****************************************************************************/ -int main (void){ - char str[20]; - - DEBUG_INIT(); +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_seed}, + { test_str, NULL, testrun_seed}, + { performance_str, NULL, testrun_performance_seed}, + { echo_str, (void*)1, (void_fpt)echo_ctrl}, + { NULL, NULL, NULL} +}; - PGM_P u = PSTR("nessie\0test\0performance\0"); - void_fpt v[] = {testrun_nessie_seed, testrun_seed, testrun_performance_seed}; +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); } - } -