fixing E-Mail-Address & Copyright

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

diff --git a/test_src/main-blake-test.c b/test_src/main-blake-test.c
index aec31497c77a9df0fd45c6093e63b4d310afb140..3efab31f4e66c40bbc4cfb5ac52f620336e702d4 100644 (file)
--- a/test_src/main-blake-test.c
+++ b/test_src/main-blake-test.c
@@ -1,7 +1,7 @@
 /* main-blake-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
@@ -21,35 +21,26 @@
  *
 */
 
-#include "config.h"
-
-#include "uart_i.h"
-#include "debug.h"
+#include "main-test-common.h"
 
 #include "blake_small.h"
 #include "blake_large.h"
-#include "hfal/hfal_blake_small.h"
-#include "hfal/hfal_blake_large.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-test.h"
-#include "hfal/hfal-performance.h"
+#include "hfal_blake_small.h"
+#include "hfal_blake_large.h"
+#include "hfal-nessie.h"
+#include "hfal-test.h"
+#include "hfal-performance.h"
 #include "shavs.h"
-#include "cli.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
 
-#include <stdint.h>
-#include <string.h>
-#include <stdlib.h>
-
-char* algo_name = "Blake";
+char *algo_name = "Blake";
 
-
-const hfdesc_t* algolist[] PROGMEM = {
-       (hfdesc_t*)&blake28_desc,
-       (hfdesc_t*)&blake32_desc,
-       (hfdesc_t*)&blake48_desc,
-       (hfdesc_t*)&blake64_desc,
+const hfdesc_t *const algolist[] PROGMEM = {
+       (hfdesc_t*)&blake224_desc,
+       (hfdesc_t*)&blake256_desc,
+       (hfdesc_t*)&blake384_desc,
+       (hfdesc_t*)&blake512_desc,
        NULL
 };
 
@@ -60,40 +51,44 @@ const hfdesc_t* algolist[] PROGMEM = {
 void testrun_nessie_blake(void){
        hfal_nessie_multiple(algolist);
 }
-void blake28_test(void* msg, uint32_t length_b){
-       hfal_test(&blake28_desc, msg, length_b);
+void blake224_test(void *msg, uint32_t length_b){
+       hfal_test(&blake224_desc, msg, length_b);
 }
 
-void blake32_test(void* msg, uint32_t length_b){
-       hfal_test(&blake32_desc, msg, length_b);
+void blake256_test(void *msg, uint32_t length_b){
+       hfal_test(&blake256_desc, msg, length_b);
 }
 
-void blake48_test(void* msg, uint32_t length_b){
-       hfal_test(&blake48_desc, msg, length_b);
+void blake384_test(void *msg, uint32_t length_b){
+       hfal_test(&blake384_desc, msg, length_b);
 }
 
-void blake64_test(void* msg, uint32_t length_b){
-       hfal_test(&blake64_desc, msg, length_b);
+void blake512_test(void *msg, uint32_t length_b){
+       hfal_test(&blake512_desc, msg, length_b);
 }
 void testrun_stdtest_blake(void){
        uint8_t msg1[144];
        memset(msg1, 0, 144);
-       blake28_test("", 8);
-       blake28_test(msg1, 576);
-       blake32_test("", 8);
-       blake32_test(msg1, 576);
-       blake48_test("", 8);
-       blake48_test(msg1, 1152);
-       blake64_test("", 8);
-       blake64_test(msg1, 1152);
+       blake224_test("", 0);
+       blake224_test("", 8);
+       blake224_test(msg1, 576);
+       blake256_test("", 0);
+       blake256_test("", 8);
+       blake256_test(msg1, 576);
+       blake384_test("", 0);
+       blake384_test("", 8);
+       blake384_test(msg1, 1152);
+       blake512_test("", 0);
+       blake512_test("", 8);
+       blake512_test(msg1, 1152);
 }
 
 void testshort(void){
-       blake32_test("", 8);
+       blake256_test("", 8);
 }
 
 void testlshort(void){
-       blake64_test("", 8);
+       blake512_test("", 8);
 }
 
 void test512_32(void){
@@ -105,7 +100,7 @@ void test512_32(void){
                                 0xDC, 0xDE, 0x57, 0x9A, 0x37, 0xE1, 0x50, 0xEF,
                                 0xBE, 0xF5, 0x55, 0x5B, 0x4C, 0x1C, 0xB4, 0x04,
                                 0x39, 0xD8, 0x35, 0xA7, 0x24, 0xE2, 0xFA, 0xE7 };
-       blake32_test(d, 512);
+       blake256_test(d, 512);
 }
 
 void performance_blake(void){
@@ -129,7 +124,7 @@ const char shavs_set_str[]    PROGMEM = "shavs_set";
 const char shavs_test1_str[]  PROGMEM = "shavs_test1";
 const char shavs_test3_str[]  PROGMEM = "shavs_test3";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,          NULL, testrun_nessie_blake},
        { test_str,            NULL, testrun_stdtest_blake},
        { testshort_str,       NULL, testshort},
@@ -145,21 +140,12 @@ cmdlist_entry_t cmdlist[] PROGMEM = {
 };
 
 int main (void){
-       DEBUG_INIT();
+    main_setup();
 
-       cli_rx = (cli_rx_fpt)uart0_getc;
-       cli_tx = (cli_tx_fpt)uart0_putc;
-       shavs_algolist=(hfdesc_t**)algolist;
-       shavs_algo=(hfdesc_t*)&blake32_desc;
+    shavs_algolist=(hfdesc_t**)algolist;
+       shavs_algo=(hfdesc_t*)&blake256_desc;
        for(;;){
-               cli_putstr_P(PSTR("\r\n\r\nCrypto-VS ("));
-               cli_putstr(algo_name);
-               cli_putstr_P(PSTR("; "));
-               cli_putstr(__DATE__);
-               cli_putstr_P(PSTR(" "));
-               cli_putstr(__TIME__);
-               cli_putstr_P(PSTR(")\r\nloaded and running\r\n"));
-
+           welcome_msg(algo_name);
                cmd_interface(cmdlist);
        }
 }