X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-sha1-test.c;h=cde507b81873527801ee83196bff7dd9d05a4738;hb=bd9d6731486cac11f6b294b3c84681eb65947f3d;hp=e8ef85f7d54d6a069cdcc1b88723fd8bbeb367af;hpb=32e8c149a5d05724c3cf32a9ec9b795ac9e87be3;p=avr-crypto-lib.git diff --git a/test_src/main-sha1-test.c b/test_src/main-sha1-test.c index e8ef85f..cde507b 100644 --- a/test_src/main-sha1-test.c +++ b/test_src/main-sha1-test.c @@ -18,35 +18,36 @@ */ /* * SHA-1 test-suit - * + * */ #include "config.h" #include "serial-tools.h" -#include "uart.h" +#include "uart_i.h" #include "debug.h" #include "sha1.h" #include "nessie_hash_test.h" -#include "performance_test.h" +#include "hfal_sha1.h" +#include "hfal-performance.h" #include #include #include #include "cli.h" +#include "shavs.h" +#include "hfal_sha1.h" +#include "dump.h" char* algo_name = "SHA-1"; +const hfdesc_t* algolist[] PROGMEM = { + (hfdesc_t*)&sha1_desc, + NULL +}; /***************************************************************************** * additional validation-functions * *****************************************************************************/ -void sha1_next_dummy(void* buffer, void* ctx){ - sha1_nextBlock(ctx, buffer); -} - -void sha1_last_dummy(void* buffer, uint16_t size_b, void* ctx){ - sha1_lastBlock(ctx, buffer, size_b); -} void testrun_nessie_sha1(void){ nessie_hash_ctx.hashsize_b = 160; @@ -54,10 +55,10 @@ void testrun_nessie_sha1(void){ nessie_hash_ctx.ctx_size_B = sizeof(sha1_ctx_t); nessie_hash_ctx.name = algo_name; nessie_hash_ctx.hash_init = (nessie_hash_init_fpt)sha1_init; - nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)sha1_next_dummy; - nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)sha1_last_dummy; + nessie_hash_ctx.hash_next = (nessie_hash_next_fpt)sha1_nextBlock; + nessie_hash_ctx.hash_last = (nessie_hash_last_fpt)sha1_lastBlock; nessie_hash_ctx.hash_conv = (nessie_hash_conv_fpt)sha1_ctx2hash; - + nessie_hash_run(); } @@ -67,41 +68,62 @@ void testrun_nessie_sha1(void){ void sha1_ctx_dump(sha1_ctx_t *s){ uint8_t i; - uart_putstr("\r\n==== sha1_ctx_dump ===="); + cli_putstr("\r\n==== sha1_ctx_dump ===="); for(i=0;i<5;++i){ - uart_putstr("\r\na["); uart_hexdump(&i, 1); uart_putstr("]: "); - uart_hexdump(&(s->h[i]), 4); + cli_putstr("\r\na["); cli_hexdump(&i, 1); cli_putstr("]: "); + cli_hexdump(&(s->h[i]), 4); } - uart_putstr("\r\nlength"); uart_hexdump(&i, 8); -} + cli_putstr("\r\nlength"); cli_hexdump(&i, 8); +} void testrun_sha1(void){ sha1_hash_t hash; sha1(&hash,"abc",3*8); - uart_putstr("\r\nsha1(\"abc\") = \r\n\t"); - uart_hexdump(hash,SHA1_HASH_BITS/8); - + cli_putstr_P(PSTR("\r\nsha1(\"abc\") = \r\n\t")); + cli_hexdump(hash,SHA1_HASH_BITS/8); + + sha1(&hash,"\0\0\0\0\0\0\0\0", 8*8); + cli_putstr_P(PSTR("\r\nsha1(8 x 0x00) = \r\n\t")); + cli_hexdump(hash,SHA1_HASH_BITS/8); +/* + Len = 496 + Msg = 46fe5ed326c8fe376fcc92dc9e2714e2240d3253b105ad + fbb256ff7a19bc40975c604ad7c0071c4fd78a7cb64786 + e1bece548fa4833c04065fe593f6fb10 + MD = f220a7457f4588d639dc21407c942e9843f8e26b +*/ + sha1(&hash,"\x46\xfe\x5e\xd3\x26\xc8\xfe\x37" + "\x6f\xcc\x92\xdc\x9e\x27\x14\xe2" + "\x24\x0d\x32\x53\xb1\x05\xad\xfb" + "\xb2\x56\xff\x7a\x19\xbc\x40\x97" + "\x5c\x60\x4a\xd7\xc0\x07\x1c\x4f" + "\xd7\x8a\x7c\xb6\x47\x86\xe1\xbe" + "\xce\x54\x8f\xa4\x83\x3c\x04\x06" + "\x5f\xe5\x93\xf6\xfb\x10", 496); + cli_putstr_P(PSTR("\r\nsha1(tv_496) = \r\n\t")); + cli_hexdump(hash,SHA1_HASH_BITS/8); + sha1(&hash,"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",448); - uart_putstr("\r\nsha1(\"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq\") = \r\n\t"); - uart_hexdump(hash,SHA1_HASH_BITS/8); - - uart_putstr("\r\nsha1(1,000,000 * 'a') = \r\n\t"); +// cli_putstr_P(PSTR("\r\nsha1(\"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq\") = \r\n\t")); + cli_hexdump(hash,SHA1_HASH_BITS/8); +/* + cli_putstr("\r\nsha1(1,000,000 * 'a') = \r\n\t"); { uint8_t block[SHA1_BLOCK_BITS/8]; uint16_t i; sha1_ctx_t s; memset(block,'a',SHA1_BLOCK_BITS/8); sha1_init(&s); - for(i=0;i<15625; ++i){ /* (1000000/(SHA1_BLOCK_BITS/8)) */ + for(i=0;i<15625; ++i){ / * (1000000/(SHA1_BLOCK_BITS/8)) * / sha1_nextBlock(&s, block); } sha1_lastBlock(&s,block,0); sha1_ctx2hash(&hash, &s); } - uart_hexdump(hash,SHA1_HASH_BITS/8); - + cli_hexdump(hash,SHA1_HASH_BITS/8); +*/ - uart_putstr("\r\nx"); + cli_putstr("\r\nx"); } @@ -109,54 +131,21 @@ void testrun_sha1_2(void){ sha1_ctx_t ctx; sha1_hash_t hash; sha1(&hash,"",0); - uart_putstr("\r\nsha1(NULL) = \r\n\t"); - uart_hexdump(hash,SHA1_HASH_BYTES); + cli_putstr_P(PSTR("\r\nsha1(NULL) = \r\n\t")); + cli_hexdump(hash,SHA1_HASH_BYTES); memset(hash, 0, SHA1_HASH_BYTES); sha1_init(&ctx); sha1_lastBlock(&ctx, "", 0); - sha1_ctx2hash(hash, &ctx); - uart_putstr("\r\nsha1(NULL) = \r\n\t"); - uart_hexdump(hash,SHA1_HASH_BYTES); + sha1_ctx2hash(&hash, &ctx); + cli_putstr_P(PSTR("\r\nsha1(NULL) = \r\n\t")); + cli_hexdump(hash,SHA1_HASH_BYTES); } void testrun_performance_sha1(void){ - uint64_t t; - char str[16]; - uint8_t data[32]; - sha1_ctx_t ctx; - - calibrateTimer(); - print_overhead(); - - memset(data, 0, 32); - - startTimer(1); - sha1_init(&ctx); - t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tctx-gen time: ")); - ultoa((unsigned long)t, str, 10); - uart_putstr(str); - - - startTimer(1); - sha1_nextBlock(&ctx, data); - t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tone-block time: ")); - ultoa((unsigned long)t, str, 10); - uart_putstr(str); - - - startTimer(1); - sha1_lastBlock(&ctx, data, 0); - t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tlast block time: ")); - ultoa((unsigned long)t, str, 10); - uart_putstr(str); - - uart_putstr_P(PSTR("\r\n")); + hfal_performance_multiple(algolist); } @@ -169,25 +158,36 @@ const char test_str[] PROGMEM = "test"; const char test2_str[] PROGMEM = "test2"; const char performance_str[] PROGMEM = "performance"; const char echo_str[] PROGMEM = "echo"; +const char shavs_list_str[] PROGMEM = "shavs_list"; +const char shavs_set_str[] PROGMEM = "shavs_set"; +const char shavs_test1_str[] PROGMEM = "shavs_test1"; +const char dump_str[] PROGMEM = "dump"; + cmdlist_entry_t cmdlist[] PROGMEM = { - { nessie_str, NULL, testrun_nessie_sha1}, - { test_str, NULL, testrun_sha1}, - { test2_str, NULL, testrun_sha1_2}, - { performance_str, NULL, testrun_performance_sha1}, - { echo_str, (void*)1, (void_fpt)echo_ctrl}, - { NULL, NULL, NULL} + { nessie_str, NULL, testrun_nessie_sha1}, + { test_str, NULL, testrun_sha1}, + { test2_str, NULL, testrun_sha1_2}, + { performance_str, NULL, testrun_performance_sha1}, + { echo_str, (void*)1, (void_fpt)echo_ctrl}, + { shavs_list_str, NULL, shavs_listalgos}, + { shavs_set_str, (void*)1, (void_fpt)shavs_setalgo}, + { shavs_test1_str, NULL, shavs_test1}, + { dump_str, (void*)1, (void_fpt)dump}, + { NULL, NULL, NULL} }; int main (void){ DEBUG_INIT(); - uart_putstr("\r\n"); - cli_rx = uart_getc; - cli_tx = uart_putc; + + cli_rx = (cli_rx_fpt)uart0_getc; + cli_tx = (cli_tx_fpt)uart0_putc; + shavs_algolist=(hfdesc_t**)algolist; + shavs_algo=(hfdesc_t*)&sha1_desc; 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); } }