X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-trivium-test.c;h=9961222866467175002d672646a78a7ff534dd1e;hb=2a5b018aa71694c5021f41e469234c3c5adb8784;hp=4d4e3d2eb3deb081cadc81a909a9d3b04e0c3ff1;hpb=2159c273c9d3361571a6ff1ab63d9bc76582fbab;p=avr-crypto-lib.git diff --git a/test_src/main-trivium-test.c b/test_src/main-trivium-test.c index 4d4e3d2..9961222 100644 --- a/test_src/main-trivium-test.c +++ b/test_src/main-trivium-test.c @@ -1,6 +1,6 @@ /* main-trivium-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,48 +22,78 @@ */ #include "config.h" -#include "serial-tools.h" -#include "uart.h" + +#include "uart_i.h" #include "debug.h" #include "cli.h" #include "trivium.h" -#include "nessie_stream_test.h" +#include "scal_trivium.h" +#include "scal-basic.h" +#include "scal-nessie.h" #include "performance_test.h" #include #include #include -char* cipher_name = "Trivium"; +char* algo_name = "Trivium"; /***************************************************************************** * additional validation-functions * *****************************************************************************/ -void trivium_genctx_dummy(uint8_t* key, uint16_t keysize_b, void* ctx){ - uint32_t iv=0; - trivium_init(key, 80, &iv, 32, ctx); -} -uint8_t trivium_getbyte_dummy(trivium_ctx_t* ctx){ - uint8_t i,ret=0; - for(i=0; i<8; ++i){ - ret<<=1; - ret |= trivium_enc(ctx); - } - return ret; +void testrun_nessie_trivium(void){ + scal_nessie_run(&trivium_desc); } -void testrun_nessie_trivium(void){ - nessie_stream_ctx.outsize_b = 8; /* actually unused */ - nessie_stream_ctx.keysize_b = 80; /* this is the one we have refrence vectors for */ - nessie_stream_ctx.ivsize_b = 32; - nessie_stream_ctx.name = cipher_name; - nessie_stream_ctx.ctx_size_B = sizeof(trivium_ctx_t); - nessie_stream_ctx.cipher_genctx = (nessie_stream_genctx_fpt)trivium_genctx_dummy; - nessie_stream_ctx.cipher_enc = (nessie_stream_genenc_fpt)trivium_getbyte_dummy; - - nessie_stream_run(); +void testrun_trivium(void){ + uint8_t key[10]; + uint8_t iv[4]; + uint8_t buffer[64]; + scgen_ctx_t ctx; + memset(key, 0, 10); + memset(iv, 0, 4); + key[0] = 0x80; + scal_cipher_init(&trivium_desc, key, 80, iv, 32, &ctx); + scal_cipher_gen_fillblock(buffer, 64, &ctx); + cli_putstr_P(PSTR("\r\nTest:\r\n Key = ")); + cli_hexdump(key, 10); + cli_putstr_P(PSTR("\r\n IV = ")); + cli_hexdump(iv, 4); + cli_putstr_P(PSTR("\r\n Cipher = ")); + cli_hexdump_block(buffer, 64, 4, 16); + scal_cipher_free(&ctx); + key[0] = 0x40; + scal_cipher_init(&trivium_desc, key, 80, iv, 32, &ctx); + scal_cipher_gen_fillblock(buffer, 64, &ctx); + cli_putstr_P(PSTR("\r\nTest:\r\n Key = ")); + cli_hexdump(key, 10); + cli_putstr_P(PSTR("\r\n IV = ")); + cli_hexdump(iv, 4); + cli_putstr_P(PSTR("\r\n Cipher = ")); + cli_hexdump_block(buffer, 64, 4, 16); + scal_cipher_free(&ctx); + key[0] = 0x20; + scal_cipher_init(&trivium_desc, key, 80, iv, 32, &ctx); + scal_cipher_gen_fillblock(buffer, 64, &ctx); + cli_putstr_P(PSTR("\r\nTest:\r\n Key = ")); + cli_hexdump(key, 10); + cli_putstr_P(PSTR("\r\n IV = ")); + cli_hexdump(iv, 4); + cli_putstr_P(PSTR("\r\n Cipher = ")); + cli_hexdump_block(buffer, 64, 4, 16); + scal_cipher_free(&ctx); + key[0] = 0x10; + scal_cipher_init(&trivium_desc, key, 80, iv, 32, &ctx); + scal_cipher_gen_fillblock(buffer, 64, &ctx); + cli_putstr_P(PSTR("\r\nTest:\r\n Key = ")); + cli_hexdump(key, 10); + cli_putstr_P(PSTR("\r\n IV = ")); + cli_hexdump(iv, 4); + cli_putstr_P(PSTR("\r\n Cipher = ")); + cli_hexdump_block(buffer, 64, 4, 16); + scal_cipher_free(&ctx); } void testrun_performance_trivium(void){ @@ -81,43 +111,46 @@ void testrun_performance_trivium(void){ startTimer(1); trivium_init(key, 80, iv, 80, &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); trivium_enc(&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); - uart_putstr_P(PSTR("\r\n")); + 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"; + +cmdlist_entry_t cmdlist[] PROGMEM = { + { nessie_str, NULL, testrun_nessie_trivium}, + { test_str, NULL, testrun_trivium}, + { performance_str, NULL, testrun_performance_trivium}, + { 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(cipher_name); - uart_putstr_P(PSTR(")\r\nloaded and running\r\n")); - - PGM_P u = PSTR("nessie\0test\0performance\0"); - void_fpt v[] = {testrun_nessie_trivium, testrun_nessie_trivium, testrun_performance_trivium}; - - 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); + } }