X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-trivium-test.c;h=bf05a81f0b3568249ffbf02bf73772616317715b;hb=27f4804c185ae24b3b6367bb2fdb898d6692d0f6;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..bf05a81 100644
--- a/test_src/main-trivium-test.c
+++ b/test_src/main-trivium-test.c
@@ -29,6 +29,7 @@
 
 #include "trivium.h"
 #include "scal_trivium.h"
+#include "scal-basic.h"
 #include "scal-nessie.h"
 #include "performance_test.h"
 
@@ -61,10 +62,9 @@ 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] = 0x00;
-	key[9] = 0x80;
+	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     = "));
@@ -72,7 +72,27 @@ 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] = 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);
 }
 
@@ -114,7 +134,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},