X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fmain-twister256-test.c;h=2b866613cf43916a7925474a0291e14c1bae7e6a;hp=2a54084b1d4333e404aabd7066f9609ff4ea35b9;hb=83d0614d8b17eac97f891f7de2bb3ef265751dea;hpb=fa7a41a129697b6e7dce363060d2265f5fdb93a6 diff --git a/test_src/main-twister256-test.c b/test_src/main-twister256-test.c index 2a54084..2b86661 100644 --- a/test_src/main-twister256-test.c +++ b/test_src/main-twister256-test.c @@ -76,7 +76,7 @@ void testrun_nessie_twister256(void){ *****************************************************************************/ void print_hash(void* hash){ - uart_hexdump(hash, 256/8); + cli_hexdump(hash, 256/8); } void testrun_twister256(void){ @@ -91,35 +91,35 @@ void testrun_twister256(void){ "12345678901234567890123456789012345678901234567890123456789012345678901234567890"}; uint32_t i; - uart_putstr_P(PSTR("\r\n=== TWISTER-256 test suit (MD5 test values) ===")); + cli_putstr_P(PSTR("\r\n=== TWISTER-256 test suit (MD5 test values) ===")); for(i=0; i<7; ++i){ - uart_putstr_P(PSTR("\r\n TWISTER-256 (\"")); - uart_putstr(testv[i]); - uart_putstr_P(PSTR("\") = \r\n\t")); + cli_putstr_P(PSTR("\r\n TWISTER-256 (\"")); + cli_putstr(testv[i]); + cli_putstr_P(PSTR("\") = \r\n\t")); twister256(&hash, testv[i], strlen(testv[i])*8); print_hash(hash); } - uart_putstr_P(PSTR("\r\n\r\n=== TWISTER-256 test suit (short test values) ===")); + cli_putstr_P(PSTR("\r\n\r\n=== TWISTER-256 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-256 (\"")); - uart_hexdump(&(stestv[i]), 1); - uart_putstr_P(PSTR("\") = \r\n\t")); + cli_putstr_P(PSTR("\r\n TWISTER-256 (\"")); + cli_hexdump(&(stestv[i]), 1); + cli_putstr_P(PSTR("\") = \r\n\t")); twister256(&hash, &(stestv[i]), stestl[i]); print_hash(hash); } #ifdef TWISTER_LONGTEST - uart_putstr_P(PSTR("\r\n\r\n=== TWISTER-256 test suit (long test) ===")); + cli_putstr_P(PSTR("\r\n\r\n=== TWISTER-256 test suit (long test) ===")); char* ltest= "abcdefghbcdefghicdefghijdefghijk" "efghijklfghijklmghijklmnhijklmno"; twister256_ctx_t ctx; twister256_init(&ctx); - uart_putstr_P(PSTR("\r\n TWISTER-256 ( 16777216 x \"")); - uart_putstr(ltest); - uart_putstr_P(PSTR("\") = \r\n\t")); + cli_putstr_P(PSTR("\r\n TWISTER-256 ( 16777216 x \"")); + cli_putstr(ltest); + cli_putstr_P(PSTR("\") = \r\n\t")); for(i=0; i<16777216; ++i){ twister224_nextBlock(&ctx, ltest); } @@ -143,34 +143,34 @@ void testrun_performance_twister256(void){ startTimer(1); twister_small_init(&ctx, 256); 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_small_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_small_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_small_ctx2hash(data, &ctx, 256); 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")); } @@ -193,13 +193,13 @@ cmdlist_entry_t cmdlist[] PROGMEM = { int main (void){ DEBUG_INIT(); - uart_putstr("\r\n"); + cli_rx = uart_getc; cli_tx = uart_putc; for(;;){ - uart_putstr_P(PSTR("\r\n\r\nCrypto-VS (")); - uart_putstr(algo_name); - uart_putstr_P(PSTR(")\r\nloaded and running\r\n")); + 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); } }