X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-trivium-test.c;h=b131830807d4c7a38602ec1c85094a8f49fb560b;hb=01b5d29136b37105c7e533bd3ec2299d31551627;hp=efbd09df141cb8da10555a2d4c090b2fde147459;hpb=12b222bf434f472559a8791acdb57c0f154111fb;p=avr-crypto-lib.git
diff --git a/test_src/main-trivium-test.c b/test_src/main-trivium-test.c
index efbd09d..b131830 100644
--- a/test_src/main-trivium-test.c
+++ b/test_src/main-trivium-test.c
@@ -17,26 +17,19 @@
along with this program. If not, see .
*/
/*
- * Mickey128 test-suit
+ * Trivium test-suit
*
*/
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
-#include "cli.h"
+#include "main-test-common.h"
#include "trivium.h"
#include "scal_trivium.h"
+#include "scal-basic.h"
#include "scal-nessie.h"
#include "performance_test.h"
-#include
-#include
-#include
-
-char* algo_name = "Trivium";
+char *algo_name = "Trivium";
/*****************************************************************************
* additional validation-functions *
@@ -61,10 +54,19 @@ void testrun_trivium(void){
cli_putstr_P(PSTR("\r\n IV = "));
cli_hexdump(iv, 4);
cli_putstr_P(PSTR("\r\n Cipher = "));
- cli_hexdump_block(buffer, 64, 4, 8);
+ 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] = 0x00;
- key[9] = 0x80;
+ 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 = "));
@@ -72,7 +74,17 @@ void testrun_trivium(void){
cli_putstr_P(PSTR("\r\n IV = "));
cli_hexdump(iv, 4);
cli_putstr_P(PSTR("\r\n Cipher = "));
- cli_hexdump_block(buffer, 64, 4, 8);
+ 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);
}
@@ -114,7 +126,7 @@ const char test_str[] PROGMEM = "test";
const char performance_str[] PROGMEM = "performance";
const char echo_str[] PROGMEM = "echo";
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
{ nessie_str, NULL, testrun_nessie_trivium},
{ test_str, NULL, testrun_trivium},
{ performance_str, NULL, testrun_performance_trivium},
@@ -123,14 +135,10 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
};
int main (void){
- DEBUG_INIT();
-
- 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);
+ main_setup();
+
+ for(;;){
+ welcome_msg(algo_name);
+ cmd_interface(cmdlist);
}
}