fixing E-Mail-Address & Copyright

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

diff --git a/test_src/main-salsa20-test.c b/test_src/main-salsa20-test.c
index b14f13888eb204deb96080226e9c3bcb503ac8d9..c9ddb831b3a235f164d10428098b25314c8b73da 100644 (file)
--- a/test_src/main-salsa20-test.c
+++ b/test_src/main-salsa20-test.c
@@ -1,7 +1,7 @@
 /* main-salsa20-test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2006-2011 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
@@ -18,24 +18,16 @@
 */
 
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "salsa20.h"
-#include "cli.h"
 #include "performance_test.h"
 
 #include "scal_salsa20.h"
 #include "scal-basic.h"
 #include "scal-nessie.h"
 
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-char* algo_name = "Salsa20";
+char *algo_name = "Salsa20";
 
 /*****************************************************************************
  *  additional validation-functions                                                                                     *
@@ -51,10 +43,10 @@ void nessie_first(void){
        cli_hexdump(key, 16);
        salsa20_init(key, 128, NULL, &ctx);
        cli_putstr_P(PSTR("\r\n internal state: "));
-       cli_hexdump_block(ctx.a, 64, 4, 16);
+       cli_hexdump_block(ctx.a.v8, 64, 4, 16);
        salsa20_gen(&ctx);
        cli_putstr_P(PSTR("\r\n internal state: "));
-       cli_hexdump_block(ctx.a, 64, 4, 16);
+       cli_hexdump_block(ctx.a.v8, 64, 4, 16);
        cli_putstr_P(PSTR("\r\n data: "));
        cli_hexdump_block(ctx.buffer, 64, 4, 16);
 
@@ -63,13 +55,13 @@ void nessie_first(void){
        key[15] = 0x01;
        cli_putstr_P(PSTR("\r\n testing with key: "));
        cli_hexdump(key, 16);
-       cli_hexdump_block(ctx.a, 64, 4, 16);
+       cli_hexdump_block(ctx.a.v8, 64, 4, 16);
        salsa20_init(key, 128, NULL, &ctx);
        cli_putstr_P(PSTR("\r\n internal state: "));
-       cli_hexdump_block(ctx.a, 64, 4, 16);
+       cli_hexdump_block(ctx.a.v8, 64, 4, 16);
        salsa20_gen(&ctx);
        cli_putstr_P(PSTR("\r\n internal state: "));
-       cli_hexdump_block(ctx.a, 64, 4, 16);
+       cli_hexdump_block(ctx.a.v8, 64, 4, 16);
        cli_putstr_P(PSTR("\r\n data: "));
        cli_hexdump_block(ctx.buffer, 64, 4, 16);
 }
@@ -125,50 +117,50 @@ Salsa20^1000000 (
  ).
  */
 
-uint8_t Salsa20_spectest0_in[] PROGMEM = {
+const uint8_t Salsa20_spectest0_in[] PROGMEM = {
        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
-uint8_t Salsa20_spectest0_ref[] PROGMEM = {
+const uint8_t Salsa20_spectest0_ref[] PROGMEM = {
        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 
 
-uint8_t Salsa20_spectest1_in[] PROGMEM = {
+const uint8_t Salsa20_spectest1_in[] PROGMEM = {
        211,159, 13,115, 76, 55, 82,183, 3,117,222, 37,191,187,234,136,
        49,237,179, 48, 1,106,178,219,175,199,166, 48, 86, 16,179,207,
        31,240, 32, 63, 15, 83, 93,161,116,147, 48,113,238, 55,204, 36,
        79,201,235, 79, 3, 81,156, 47,203, 26,244,243, 88,118,104, 54 };
 
-uint8_t Salsa20_spectest1_ref[] PROGMEM = {
+const uint8_t Salsa20_spectest1_ref[] PROGMEM = {
        109, 42,178,168,156,240,248,238,168,196,190,203, 26,110,170,154,
        29, 29,150, 26,150, 30,235,249,190,163,251, 48, 69,144, 51, 57,
        118, 40,152,157,180, 57, 27, 94,107, 42,236, 35, 27,111,114,114,
        219,236,232,135,111,155,110, 18, 24,232, 95,158,179, 19, 48,202 };
 
-uint8_t Salsa20_spectest2_in[] PROGMEM = {
+const uint8_t Salsa20_spectest2_in[] PROGMEM = {
        88,118,104, 54, 79,201,235, 79, 3, 81,156, 47,203, 26,244,243,
        191,187,234,136,211,159, 13,115, 76, 55, 82,183, 3,117,222, 37,
        86, 16,179,207, 49,237,179, 48, 1,106,178,219,175,199,166, 48,
        238, 55,204, 36, 31,240, 32, 63, 15, 83, 93,161,116,147, 48,113 };
 
-uint8_t Salsa20_spectest2_ref[] PROGMEM = {
+const uint8_t Salsa20_spectest2_ref[] PROGMEM = {
        179, 19, 48,202,219,236,232,135,111,155,110, 18, 24,232, 95,158,
        26,110,170,154,109, 42,178,168,156,240,248,238,168,196,190,203,
        69,144, 51, 57, 29, 29,150, 26,150, 30,235,249,190,163,251, 48,
        27,111,114,114,118, 40,152,157,180, 57, 27, 94,107, 42,236, 35 };
 
-uint8_t Salsa20_spectest3_in[] PROGMEM = {
+const uint8_t Salsa20_spectest3_in[] PROGMEM = {
        6,124, 83,146, 38,191, 9, 50, 4,161, 47,222,122,182,223,185,
        75, 27, 0,216, 16,122, 7, 89,162,104,101,147,213, 21, 54, 95,
        225,253,139,176,105,132, 23,116, 76, 41,176,207,221, 34,157,108,
        94, 94, 99, 52, 90,117, 91,220,146,190,239,143,196,176,130,186 };
 
-uint8_t Salsa20_spectest3_ref[] PROGMEM = {
+const uint8_t Salsa20_spectest3_ref[] PROGMEM = {
        8, 18, 38,199,119, 76,215, 67,173,127,144,162,103,212,176,217,
        192, 19,233, 33,159,197,154,160,128,243,219, 65,171,136,135,225,
        123, 11, 68, 86,237, 82, 20,155,133,189, 9, 83,167,116,194, 78,
@@ -232,12 +224,11 @@ void testrun_nessie_salsa20(void){
        scal_nessie_run(&salsa20_desc);
 }
 
-/*
-void testrun_performance_arcfour(void){
+void testrun_performance_salsa20(void){
        uint64_t t;
        char str[16];
-       uint8_t key[16];
-       arcfour_ctx_t ctx;
+       uint8_t key[32];
+       salsa20_ctx_t ctx;
 
        calibrateTimer();
        print_overhead();
@@ -245,14 +236,14 @@ void testrun_performance_arcfour(void){
        memset(key,  0, 16);
 
        startTimer(1);
-       arcfour_init(key, 16, &ctx);
+       salsa20_init(key, 128, NULL, &ctx);
        t = stopTimer();
        cli_putstr_P(PSTR("\r\n\tctx-gen time: "));
        ultoa((unsigned long)t, str, 10);
        cli_putstr(str);
 
        startTimer(1);
-       arcfour_gen(&ctx);
+       salsa20_gen(&ctx);
        t = stopTimer();
        cli_putstr_P(PSTR("\r\n\tencrypt time: "));
        ultoa((unsigned long)t, str, 10);
@@ -260,7 +251,7 @@ void testrun_performance_arcfour(void){
 
        cli_putstr_P(PSTR("\r\n"));
 }
-*/
+
 
 /*****************************************************************************
  *  main                                                                                                                                        *
@@ -271,24 +262,20 @@ 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_salsa20 },
-//     { performance_str, NULL, testrun_performance_arcfour},
+       { performance_str, NULL, testrun_performance_salsa20},
        { test_str,        NULL, spec_test},
        { echo_str,    (void*)1, (void_fpt)echo_ctrl},
        { NULL,            NULL, NULL}
 };
 
 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);
        }
 }