X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-omac-noekeon-test.c;h=a5a0e7990d0746d652a026d785be7e95da241c5d;hb=701cee0d98aab48dd3192c8cc7c77eb42581bc56;hp=2ec240813ee246be095668aaec4da65bcbdf1f11;hpb=7cd0bb77cb76ef7c45b41fd33ca364ddb89ec1ad;p=avr-crypto-lib.git diff --git a/test_src/main-omac-noekeon-test.c b/test_src/main-omac-noekeon-test.c index 2ec2408..a5a0e79 100644 --- a/test_src/main-omac-noekeon-test.c +++ b/test_src/main-omac-noekeon-test.c @@ -1,6 +1,6 @@ /* main-omac-noekeon-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 "noekeon.h" @@ -31,7 +31,9 @@ #include "cli.h" #include "nessie_mac_test.h" +#include "performance_test.h" +#include #include #include @@ -43,20 +45,20 @@ char* algo_name = "OMAC-Noekeon"; void test_mac(void* key, void* data, uint16_t datalength_b){ uint8_t mac[16]; - uart_putstr_P(PSTR("\r\n-----------\r\n msg length (bit): 0x")); - uart_hexdump(((uint8_t*)&datalength_b)+1, 1); - uart_hexdump(((uint8_t*)&datalength_b)+0, 1); - uart_putstr_P(PSTR("\r\n msg: ")); - uart_hexdump(data, (datalength_b+7)/8); - uart_putstr_P(PSTR("\r\n key: ")); - uart_hexdump(key, 16); + cli_putstr_P(PSTR("\r\n-----------\r\n msg length (bit): 0x")); + cli_hexdump(((uint8_t*)&datalength_b)+1, 1); + cli_hexdump(((uint8_t*)&datalength_b)+0, 1); + cli_putstr_P(PSTR("\r\n msg: ")); + cli_hexdump(data, (datalength_b+7)/8); + cli_putstr_P(PSTR("\r\n key: ")); + cli_hexdump(key, 16); omac_noekeon(mac, data, datalength_b, key, (uint8_t)-1); - uart_putstr_P(PSTR("\r\n mac: ")); - uart_hexdump(mac, 16); + cli_putstr_P(PSTR("\r\n mac: ")); + cli_hexdump(mac, 16); } -void testrun_test_noekeonomac(void){ +void testrun_test_omac_noekeon(void){ uint8_t key[16], data[64]; uint16_t i; memset(key, 0xAA, 16); @@ -70,70 +72,108 @@ void testrun_test_noekeonomac(void){ uint8_t stat_key[16]; -void noekeonomac_next_dummy(void* buffer, void* ctx){ +void omac_noekeon_next_dummy(void* ctx, const void* buffer){ omac_noekeon_next(buffer, stat_key, ctx); } -void noekeonomac_init_dummy(void* key, uint16_t keysize_b, void* ctx){ +void omac_noekeon_init_dummy(void* ctx, const void* key, uint16_t keysize_b){ omac_noekeon_init(ctx); memcpy(stat_key, key, 16); } -void noekeonomac_last_dummy(void* buffer, uint16_t size_b, void* key, uint16_t keysize_b, void* ctx){ +void omac_noekeon_last_dummy(void* ctx, const void* buffer, uint16_t size_b){ while(size_b>128){ - omac_noekeon_next(buffer, key, ctx); + omac_noekeon_next(buffer, stat_key, ctx); size_b -= 128; buffer = (uint8_t*)buffer +16; } - omac_noekeon_last(buffer, size_b, key, ctx); + omac_noekeon_last(buffer, size_b, stat_key, ctx); } -void noekeonomac_conv_dummy(void* buffer, void* ctx){ +void omac_noekeon_conv_dummy(void* buffer, void* ctx){ memcpy(buffer, ctx, 16); } -void testrun_nessie_noekeonomac(void){ +void testrun_nessie_omac_noekeon(void){ nessie_mac_ctx.macsize_b = 128; nessie_mac_ctx.keysize_b = 128; nessie_mac_ctx.blocksize_B = 16; - nessie_mac_ctx.ctx_size_B = sizeof(noekeon_omac_ctx_t); + nessie_mac_ctx.ctx_size_B = sizeof(omac_noekeon_ctx_t); nessie_mac_ctx.name = algo_name; - nessie_mac_ctx.mac_init = noekeonomac_init_dummy; - nessie_mac_ctx.mac_next = noekeonomac_next_dummy; - nessie_mac_ctx.mac_last = noekeonomac_last_dummy; - nessie_mac_ctx.mac_conv = noekeonomac_conv_dummy; + nessie_mac_ctx.mac_init = omac_noekeon_init_dummy; + nessie_mac_ctx.mac_next = omac_noekeon_next_dummy; + nessie_mac_ctx.mac_last = omac_noekeon_last_dummy; + nessie_mac_ctx.mac_conv = omac_noekeon_conv_dummy; nessie_mac_run(); } +/******************************************************************************/ - +void testrun_performance_omac_noekeon(void){ + uint64_t t; + char str[16]; + uint8_t data[16], key[16]; + omac_noekeon_ctx_t ctx; + + calibrateTimer(); + print_overhead(); + + memset(data, 0, 16); + memset(key, 0, 16); + + startTimer(1); + omac_noekeon_init(&ctx); + t = stopTimer(); + cli_putstr_P(PSTR("\r\n\tctx-gen time: ")); + ultoa((unsigned long)t, str, 10); + cli_putstr(str); + + + startTimer(1); + omac_noekeon_next(data, key, &ctx); + t = stopTimer(); + cli_putstr_P(PSTR("\r\n\tone-block time: ")); + ultoa((unsigned long)t, str, 10); + cli_putstr(str); + + + startTimer(1); + omac_noekeon_last(data, 128, key, &ctx); + t = stopTimer(); + cli_putstr_P(PSTR("\r\n\tlast block time: ")); + ultoa((unsigned long)t, str, 10); + cli_putstr(str); + + cli_putstr_P(PSTR("\r\n")); +} /***************************************************************************** * main * *****************************************************************************/ +const char nessie_str[] PROGMEM = "nessie"; +const char test_str[] PROGMEM = "test"; +const char performance_str[] PROGMEM = "performance"; +const char echo_str[] PROGMEM = "echo"; + +const cmdlist_entry_t cmdlist[] PROGMEM = { + { nessie_str, NULL, testrun_nessie_omac_noekeon }, + { test_str, NULL, testrun_test_omac_noekeon}, + { performance_str, NULL, testrun_performance_omac_noekeon}, + { echo_str, (void*)1, (void_fpt)echo_ctrl}, + { NULL, NULL, NULL} +}; + int main (void){ - char str[20]; DEBUG_INIT(); - uart_putstr("\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\0"); - void_fpt v[] = {testrun_nessie_noekeonomac, testrun_test_noekeonomac}; - - 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); + } } -