fixing E-Mail-Address & Copyright

[avr-crypto-lib.git] / test_src / main-trivium-test.c

diff --git a/test_src/main-trivium-test.c b/test_src/main-trivium-test.c
index efbd09df141cb8da10555a2d4c090b2fde147459..20400835ede976426fd0ebb15950a3babceaf925 100644 (file)
--- a/test_src/main-trivium-test.c
+++ b/test_src/main-trivium-test.c
@@ -1,7 +1,7 @@
 /* main-trivium-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,26 +17,19 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 /*
- * 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 <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-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);
        }
 }