X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-twister384-test.c;h=798d48f3af059a121e00f07b94dad4b4fa298020;hb=2deab9197b8d9d74c01156777b250746c36fba07;hp=dcd0195c2745640d08ec2912407a24b0c72730c5;hpb=17332291e15183d71d88ed868275e3cb53917180;p=avr-crypto-lib.git diff --git a/test_src/main-twister384-test.c b/test_src/main-twister384-test.c index dcd0195..798d48f 100644 --- a/test_src/main-twister384-test.c +++ b/test_src/main-twister384-test.c @@ -1,6 +1,6 @@ /* main-twister384-test.c */ /* - This file is part of the This file is part of the AVR-Crypto-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 @@ -44,14 +44,6 @@ void twister384_init_dummy(void* ctx){ twister_big_init(ctx, 384); } -void twister384_next_dummy(void* buffer, void* ctx){ - twister_big_nextBlock(ctx, buffer); -} - -void twister384_last_dummy(void* buffer, uint16_t size_b, void* ctx){ - twister_big_lastBlock(ctx, buffer, size_b); -} - void twister384_ctx2hash_dummy(void* buffer, void* ctx){ twister_big_ctx2hash(buffer, ctx, 384); } @@ -63,8 +55,8 @@ void testrun_nessie_twister384(void){ nessie_hash_ctx.ctx_size_B = sizeof(twister_big_ctx_t); nessie_hash_ctx.name = algo_name; nessie_hash_ctx.hash_init = (nessie_hash_init_fpt)twister384_init_dummy; - nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)twister384_next_dummy; - nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)twister384_last_dummy; + nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)twister_big_nextBlock; + nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)twister_big_lastBlock; nessie_hash_ctx.hash_conv = (nessie_hash_conv_fpt)twister384_ctx2hash_dummy; nessie_hash_run(); @@ -75,9 +67,9 @@ void testrun_nessie_twister384(void){ ******************************************************************************/ void print_hash(void* hash){ - uart_hexdump(hash, 256/8); - uart_putstr_P(PSTR("\r\n\t")); - uart_hexdump((uint8_t*)hash+256/8, 128/8); + cli_hexdump(hash, 256/8); + cli_putstr_P(PSTR("\r\n\t")); + cli_hexdump((uint8_t*)hash+256/8, 128/8); } @@ -93,36 +85,36 @@ void testrun_twister384(void){ "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}; uint32_t i; - uart_putstr_P(PSTR("\r\n=== TWISTER-384 test suit (MD5 test values) ===")); + cli_putstr_P(PSTR("\r\n=== TWISTER-384 test suit (MD5 test values) ===")); for(i=0; i<7; ++i){ - uart_putstr_P(PSTR("\r\n TWISTER-384 (\"")); - uart_putstr(testv[i]); - uart_putstr_P(PSTR("\") = \r\n\t")); + cli_putstr_P(PSTR("\r\n TWISTER-384 (\"")); + cli_putstr(testv[i]); + cli_putstr_P(PSTR("\") = \r\n\t")); twister384(&hash, testv[i], strlen(testv[i])*8); print_hash(hash); // return; } - uart_putstr_P(PSTR("\r\n\r\n=== TWISTER-384 test suit (short test values) ===")); + cli_putstr_P(PSTR("\r\n\r\n=== TWISTER-384 test suit (short test values) ===")); uint8_t stestv[]= {0x00, 0x00, 0xC0, 0xC0, 0x80, 0x48, 0x50}; uint8_t stestl[]= { 0, 1, 2, 3, 4, 5, 6}; for(i=0; i<7; ++i){ - uart_putstr_P(PSTR("\r\n TWISTER-384 (\"")); - uart_hexdump(&(stestv[i]), 1); - uart_putstr_P(PSTR("\") = \r\n\t")); + cli_putstr_P(PSTR("\r\n TWISTER-384 (\"")); + cli_hexdump(&(stestv[i]), 1); + cli_putstr_P(PSTR("\") = \r\n\t")); twister384(hash, &(stestv[i]), stestl[i]); print_hash(hash); } #ifdef TWISTER_LONGTEST - uart_putstr_P(PSTR("\r\n\r\n=== TWISTER-384 test suit (long test) ===")); + cli_putstr_P(PSTR("\r\n\r\n=== TWISTER-384 test suit (long test) ===")); char* ltest= "abcdefghbcdefghicdefghijdefghijk" "efghijklfghijklmghijklmnhijklmno"; twister384_ctx_t ctx; twister384_init(&ctx); - uart_putstr_P(PSTR("\r\n TWISTER-384 ( 16777216 x \"")); - uart_putstr(ltest); - uart_putstr_P(PSTR("\") = \r\n\t")); + cli_putstr_P(PSTR("\r\n TWISTER-384 ( 16777216 x \"")); + cli_putstr(ltest); + cli_putstr_P(PSTR("\") = \r\n\t")); for(i=0; i<16777216; ++i){ twister384_nextBlock(&ctx, ltest); } @@ -146,34 +138,34 @@ void testrun_performance_twister384(void){ startTimer(1); twister_big_init(&ctx, 384); t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tctx-gen time: ")); + cli_putstr_P(PSTR("\r\n\tctx-gen time: ")); ultoa((unsigned long)t, str, 10); - uart_putstr(str); + cli_putstr(str); startTimer(1); twister_big_nextBlock(&ctx, data); t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tone-block time: ")); + cli_putstr_P(PSTR("\r\n\tone-block time: ")); ultoa((unsigned long)t, str, 10); - uart_putstr(str); + cli_putstr(str); startTimer(1); twister_big_lastBlock(&ctx, data, 0); t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tlast block time: ")); + cli_putstr_P(PSTR("\r\n\tlast block time: ")); ultoa((unsigned long)t, str, 10); - uart_putstr(str); + cli_putstr(str); startTimer(1); twister_big_ctx2hash(data, &ctx, 384); t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tctx2hash time: ")); + cli_putstr_P(PSTR("\r\n\tctx2hash time: ")); ultoa((unsigned long)t, str, 10); - uart_putstr(str); + cli_putstr(str); - uart_putstr_P(PSTR("\r\n")); + cli_putstr_P(PSTR("\r\n")); } @@ -182,29 +174,28 @@ void testrun_performance_twister384(void){ * *****************************************************************************/ -int main (void){ - char str[20]; +const char nessie_str[] PROGMEM = "nessie"; +const char test_str[] PROGMEM = "test"; +const char performance_str[] PROGMEM = "performance"; +const char echo_str[] PROGMEM = "echo"; - +cmdlist_entry_t cmdlist[] PROGMEM = { + { nessie_str, NULL, testrun_nessie_twister384}, + { test_str, NULL, testrun_twister384}, + { performance_str, NULL, testrun_performance_twister384}, + { echo_str, (void*)1, (void_fpt)echo_ctrl}, + { NULL, NULL, NULL} +}; + +int main (void){ DEBUG_INIT(); - uart_putstr_P(PSTR("\r\n")); - - uart_putstr_P(PSTR("\r\n\r\nCrypto-VS (")); - uart_putstr(algo_name); - uart_putstr_P(PSTR(")\r\nloaded and running\r\n")); - PGM_P u = PSTR("nessie\0test\0performance\0"); - void_fpt v[] = { testrun_nessie_twister384, - testrun_twister384, - testrun_performance_twister384 }; - - 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"); + + cli_rx = uart_getc; + cli_tx = uart_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); } } -