X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-cast5-test.c;h=a8f88900e2ec341e362cb14eba82da359e0aa413;hb=302f07c97444e2f5f5560dc2fd9af58d4b591d45;hp=a5f30215d6b178b6b6778bf5968f3e15f13c0f63;hpb=6bd58d7909b89a3e05003a63cdc642638fa653e6;p=avr-crypto-lib.git diff --git a/test_src/main-cast5-test.c b/test_src/main-cast5-test.c index a5f3021..a8f8890 100644 --- a/test_src/main-cast5-test.c +++ b/test_src/main-cast5-test.c @@ -1,6 +1,6 @@ /* main-cast5-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 @@ -22,8 +22,8 @@ */ #include "config.h" -#include "serial-tools.h" -#include "uart.h" + +#include "uart_i.h" #include "debug.h" #include @@ -35,7 +35,7 @@ #include #include -char* cipher_name = "cast-128 (cast5)"; +char* algo_name = "cast-128 (cast5)"; /***************************************************************************** * additional validation-functions * @@ -44,7 +44,7 @@ char* cipher_name = "cast-128 (cast5)"; void testrun_nessie_cast5(void){ nessie_bc_ctx.blocksize_B = 8; nessie_bc_ctx.keysize_b = 128; - nessie_bc_ctx.name = cipher_name; + nessie_bc_ctx.name = algo_name; nessie_bc_ctx.ctx_size_B = sizeof(cast5_ctx_t); nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)cast5_enc; nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)cast5_dec; @@ -59,18 +59,18 @@ void testrun_nessie_cast5(void){ void cast5_ctx_dump(cast5_ctx_t *s){ uint8_t i; - uart_putstr("\r\n==== cast5_ctx_dump ====\r\n shortkey: "); - uart_putstr(s->shortkey?"yes":"no"); + cli_putstr("\r\n==== cast5_ctx_dump ====\r\n shortkey: "); + cli_putstr(s->shortkey?"yes":"no"); for(i=0;i<16;++i){ uint8_t r; - uart_putstr("\r\n Km"); uart_hexdump(&i, 1); uart_putc(':'); - uart_hexdump(&(s->mask[i]), 4); - uart_putstr("\r\n Kr"); uart_hexdump(&i, 1); uart_putc(':'); + cli_putstr("\r\n Km"); cli_hexdump(&i, 1); cli_putc(':'); + cli_hexdump(&(s->mask[i]), 4); + cli_putstr("\r\n Kr"); cli_hexdump(&i, 1); cli_putc(':'); r = (s->rotl[i/2]); if (i&0x01) r >>= 4; r &= 0xf; r += (s->roth[i>>3]&(1<<(i&0x7)))?0x10:0x00; - uart_hexdump(&r, 1); + cli_hexdump(&r, 1); } } @@ -78,32 +78,32 @@ void cast5_ctx_dump(cast5_ctx_t *s){ void test_encrypt(uint8_t *block, uint8_t *key, uint8_t keylength, bool print){ cast5_ctx_t s; if (print){ - uart_putstr("\r\nCAST5:\r\n key:\t"); - uart_hexdump(key, keylength/8); - uart_putstr("\r\n plaintext:\t"); - uart_hexdump(block, 8); + cli_putstr("\r\nCAST5:\r\n key:\t"); + cli_hexdump(key, keylength/8); + cli_putstr("\r\n plaintext:\t"); + cli_hexdump(block, 8); } cast5_init(key, keylength, &s); cast5_enc(block, &s); if (print){ - uart_putstr("\r\n ciphertext:\t"); - uart_hexdump(block, 8); + cli_putstr("\r\n ciphertext:\t"); + cli_hexdump(block, 8); } } void test_decrypt(uint8_t *block, uint8_t *key, uint8_t keylength, bool print){ cast5_ctx_t s; if (print){ - uart_putstr("\r\nCAST5:\r\n key:\t"); - uart_hexdump(key, keylength/8); - uart_putstr("\r\n ciphertext:\t"); - uart_hexdump(block, 8); + cli_putstr("\r\nCAST5:\r\n key:\t"); + cli_hexdump(key, keylength/8); + cli_putstr("\r\n ciphertext:\t"); + cli_hexdump(block, 8); } cast5_init(key, keylength, &s); cast5_dec(block, &s); if (print){ - uart_putstr("\r\n plaintext:\t"); - uart_hexdump(block, 8); + cli_putstr("\r\n plaintext:\t"); + cli_hexdump(block, 8); } } @@ -126,7 +126,7 @@ void testrun_cast5(void){ test_decrypt(block, key, 40, true); /**** long test *****/ - uart_putstr("\r\nmaintance-test"); + cli_putstr("\r\nmaintance-test"); uint8_t a[16]= {0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78, 0x23, 0x45, 0x67, 0x89, 0x34, 0x56, 0x78, @@ -142,12 +142,12 @@ void testrun_cast5(void){ test_encrypt(&(b[0]), &(a[0]), 128, false); test_encrypt(&(b[8]), &(a[0]), 128, false); if ((i&0x000000ff) == 0){ - uart_putstr("\r\n"); - uart_hexdump(&i, 4); + + cli_hexdump(&i, 4); } } - uart_putstr("\r\na = "); uart_hexdump(a, 16); - uart_putstr("\r\nb = "); uart_hexdump(b, 16); + cli_putstr("\r\na = "); cli_hexdump(a, 16); + cli_putstr("\r\nb = "); cli_hexdump(b, 16); } @@ -166,55 +166,55 @@ void testrun_performance_cast5(void){ startTimer(1); cast5_init(key, 128, &ctx); 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); cast5_enc(data, &ctx); t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tencrypt time: ")); + cli_putstr_P(PSTR("\r\n\tencrypt time: ")); ultoa((unsigned long)t, str, 10); - uart_putstr(str); + cli_putstr(str); startTimer(1); cast5_dec(data, &ctx); t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tdecrypt time: ")); + cli_putstr_P(PSTR("\r\n\tdecrypt 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")); } /***************************************************************************** * 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")); +cmdlist_entry_t cmdlist[] PROGMEM = { + { nessie_str, NULL, testrun_nessie_cast5}, + { test_str, NULL, testrun_cast5}, + { performance_str, NULL, testrun_performance_cast5}, + { echo_str, (void*)1, (void_fpt)echo_ctrl}, + { NULL, NULL, NULL} +}; - PGM_P u = PSTR("nessie\0test\0performance\0"); - void_fpt v[] = {testrun_nessie_cast5, testrun_cast5, testrun_performance_cast5}; +int main (void){ + DEBUG_INIT(); - 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 = (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); } } -