adding SHA-2 (now complete) in C

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

diff --git a/test_src/main-keccak-test.c b/test_src/main-keccak-test.c
index ba66f318535839f9fe46015a0d46ed4aaaa2c0cd..07a27d6812d4ee5dfb581ec21f40a504df7fec48 100644 (file)
--- a/test_src/main-keccak-test.c
+++ b/test_src/main-keccak-test.c
@@ -27,13 +27,13 @@
 
 #include "keccak.h"
 #include "cli.h"
-#include "hfal/hfal_keccak.h"
+#include "hfal_keccak.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -42,7 +42,7 @@
 char* algo_name = "Keccak";
 
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t* const algolist[] PROGMEM = {
        (hfdesc_t*)&keccak224_desc,
        (hfdesc_t*)&keccak256_desc,
        (hfdesc_t*)&keccak384_desc,
@@ -54,7 +54,6 @@ const hfdesc_t* algolist[] PROGMEM = {
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
 void test_256(void){
-       uint8_t data[] = {0x53, 0x58, 0x7B,  0xC8 };
        uint8_t hash[32];
        uint8_t null[KECCAK256_BLOCKSIZE_B];
        memset(null, 0, KECCAK256_BLOCKSIZE_B);
@@ -88,7 +87,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_keccak     },
        { performance_str,           NULL, performance_keccak        },
        { test256_str,               NULL, test_256                  },