X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-skipjack-test.c;h=48de3cf327ab1cd9bace25b7dd92039460681b7c;hb=27f4804c185ae24b3b6367bb2fdb898d6692d0f6;hp=a7f1165c697fa97bd0ccac0e9cea178b657ed47a;hpb=2159c273c9d3361571a6ff1ab63d9bc76582fbab;p=avr-crypto-lib.git diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c index a7f1165..48de3cf 100644 --- a/test_src/main-skipjack-test.c +++ b/test_src/main-skipjack-test.c @@ -1,6 +1,6 @@ /* main-skipjack-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,22 +22,29 @@ */ #include "config.h" -#include "serial-tools.h" -#include "uart.h" + +#include "uart_i.h" #include "debug.h" #include "skipjack.h" #include "nessie_bc_test.h" #include "cli.h" #include "performance_test.h" +#include "bcal-performance.h" +#include "bcal-nessie.h" +#include "bcal_skipjack.h" #include #include #include -char* cipher_name = "Skipjack"; +char* algo_name = "Skipjack"; +const bcdesc_t* const algolist[] PROGMEM = { + (bcdesc_t*)&skipjack_desc, + NULL +}; /***************************************************************************** * additional validation-functions * *****************************************************************************/ @@ -46,45 +53,60 @@ void skipjack_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){ } void testrun_nessie_skipjack(void){ - nessie_bc_ctx.blocksize_B = 8; - nessie_bc_ctx.keysize_b = 80; - nessie_bc_ctx.name = cipher_name; - nessie_bc_ctx.ctx_size_B = 10; - nessie_bc_ctx.cipher_enc = (nessie_bc_enc_fpt)skipjack_enc; - nessie_bc_ctx.cipher_dec = (nessie_bc_dec_fpt)skipjack_dec; - nessie_bc_ctx.cipher_genctx = (nessie_bc_gen_fpt)skipjack_genctx_dummy; - - nessie_bc_run(); + bcal_nessie_multiple(algolist); } void testrun_performance_skipjack(void){ - uint64_t t; - char str[16]; - uint8_t key[10], data[8]; - - calibrateTimer(); - print_overhead(); - - memset(key, 0, 10); - memset(data, 0, 8); - - startTimer(1); + bcal_performance_multiple(algolist); +} + +int test_enc(const void* buffer, void* key){ + uint8_t data[8]; + int r; + memcpy(data, buffer, 8); skipjack_enc(data, key); - t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tencrypt time: ")); - ultoa((unsigned long)t, str, 10); - uart_putstr(str); - - - startTimer(1); + cli_putstr_P(PSTR(" key = ")); + cli_hexdump(key, 10); + cli_putstr_P(PSTR(" plaintext = ")); + cli_hexdump(buffer, 8); + cli_putstr_P(PSTR(" ciphertext = ")); + cli_hexdump(data, 8); skipjack_dec(data, key); - t = stopTimer(); - uart_putstr_P(PSTR("\r\n\tdecrypt time: ")); - ultoa((unsigned long)t, str, 10); - uart_putstr(str); - - uart_putstr_P(PSTR("\r\n")); + r = memcmp(data, buffer, 8); + cli_putstr_P(PSTR(" decrypt: ")); + if(r){ + cli_putstr_P(PSTR("fail")); + }else{ + cli_putstr_P(PSTR("ok")); + } + return r; +} + +void testrun_nist_vectors(void){ + uint8_t key[10]; + uint8_t data[8]; + uint8_t i; + + cli_putstr_P(PSTR("\r\n\r\n=== NIST vectors run 1 ===")); + memset(key, 0, 10); + for(i=0; i<64; ++i){ + memset(data, 0, 8); + data[i>>3] |= 0x80 >> (i & 7); + cli_putstr_P(PSTR("\r\n round: 0x")); + cli_hexdump_byte(i); + test_enc(data, key); + } + + cli_putstr_P(PSTR("\r\n\r\n=== NIST vectors run 2 ===")); + memset(data, 0, 8); + for(i=0; i<80; ++i){ + memset(key, 0, 10); + key[i>>3] |= 0x80 >> (i & 7); + cli_putstr_P(PSTR("\r\n round: 0x")); + cli_hexdump_byte(i); + test_enc(data, key); + } } /***************************************************************************** @@ -92,31 +114,43 @@ void testrun_performance_skipjack(void){ *****************************************************************************/ void testencrypt(uint8_t* block, uint8_t* key){ - uart_putstr("\r\n==testy-encrypt==\r\n key: "); - uart_hexdump(key,10); - uart_putstr("\r\n plain: "); - uart_hexdump(block,8); + cli_putstr("\r\n==testy-encrypt==\r\n key: "); + cli_hexdump(key,10); + cli_putstr("\r\n plain: "); + cli_hexdump(block,8); skipjack_enc(block,key); - uart_putstr("\r\n crypt: "); - uart_hexdump(block,8); + cli_putstr("\r\n crypt: "); + cli_hexdump(block,8); } void testdecrypt(uint8_t* block, uint8_t* key){ - uart_putstr("\r\n==testy-decrypt==\r\n key: "); - uart_hexdump(key,10); - uart_putstr("\r\n crypt: "); - uart_hexdump(block,8); + cli_putstr("\r\n==testy-decrypt==\r\n key: "); + cli_hexdump(key,10); + cli_putstr("\r\n crypt: "); + cli_hexdump(block,8); skipjack_dec(block,key); - uart_putstr("\r\n plain: "); - uart_hexdump(block,8); + cli_putstr("\r\n plain: "); + cli_hexdump(block,8); } void testrun_skipjack(void){ - uint8_t key[]={ 0x00, 0x99, 0x88, 0x77, 0x66, - 0x55, 0x44, 0x33, 0x22, 0x11}; - uint8_t data[]={ 0x33, 0x22, 0x11, 0x00, 0xdd, 0xcc, 0xbb, 0xaa}; - testencrypt(data,key); - testdecrypt(data,key); + uint8_t key[2][10]={ + { 0x00, 0x99, 0x88, 0x77, 0x66, + 0x55, 0x44, 0x33, 0x22, 0x11 }, + { 0x11, 0x22, 0x33, 0x44, 0x55, + 0x66, 0x77, 0x88, 0x99, 0x00 } + }; + + uint8_t data[2][8]={ + { 0x33, 0x22, 0x11, 0x00, + 0xdd, 0xcc, 0xbb, 0xaa }, + { 0xaa, 0xbb, 0xcc, 0xdd, + 0x00, 0x11, 0x22, 0x33 } + }; + testencrypt(data[0],key[0]); + testdecrypt(data[0],key[0]); + testencrypt(data[1],key[1]); + testdecrypt(data[1],key[1]); } @@ -125,26 +159,30 @@ void testrun_skipjack(void){ * main * *****************************************************************************/ -int main (void){ - char str[20]; +const char nessie_str[] PROGMEM = "nessie"; +const char test_str[] PROGMEM = "test"; +const char nist_str[] PROGMEM = "nist"; +const char performance_str[] PROGMEM = "performance"; +const char echo_str[] PROGMEM = "echo"; + +const cmdlist_entry_t cmdlist[] PROGMEM = { + { nessie_str, NULL, testrun_nessie_skipjack}, + { test_str, NULL, testrun_skipjack}, + { nist_str, NULL, testrun_nist_vectors}, + { performance_str, NULL, testrun_performance_skipjack}, + { echo_str, (void*)1, (void_fpt)echo_ctrl}, + { NULL, NULL, NULL} +}; +int main (void){ DEBUG_INIT(); - uart_putstr("\r\n"); - - uart_putstr("\r\n\r\nCrypto-VS (skipjack)\r\nloaded and running\r\n"); - - PGM_P u = PSTR("nessie\0test\0performance\0"); - void_fpt v[] = {testrun_nessie_skipjack, testrun_skipjack, testrun_performance_skipjack}; - - 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); + } } -