a lot of fixes

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

diff --git a/test_src/main-skein-test.c b/test_src/main-skein-test.c
index dc46b131b10a2dc3ad2152eb54d10c3b9fc1eaa4..e93f9d16569fb4831f2a68b89695cec565c9d3f4 100644 (file)
--- a/test_src/main-skein-test.c
+++ b/test_src/main-skein-test.c
@@ -27,16 +27,16 @@
 #include "debug.h"
 
 #include "skein.h"
-#include "hfal/hfal_skein256.h"
-#include "hfal/hfal_skein512.h"
-#include "hfal/hfal_skein1024.h"
+#include "hfal_skein256.h"
+#include "hfal_skein512.h"
+#include "hfal_skein1024.h"
 #include "cli.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-basic.h"
+#include "hfal-performance.h"
+#include "hfal-nessie.h"
+#include "hfal-basic.h"
 
 
 #include <stdint.h>
@@ -45,7 +45,7 @@
 
 char* algo_name = "Skein";
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t* const algolist[] PROGMEM = {
        (hfdesc_t*)&skein256_128_desc,
        (hfdesc_t*)&skein256_160_desc,
        (hfdesc_t*)&skein256_224_desc,
@@ -259,7 +259,7 @@ const char shavs_test1_str[] PROGMEM = "shavs_test1";
 const char shavs_test2_str[] PROGMEM = "shavs_test2";
 const char shavs_test3_str[] PROGMEM = "shavs_test3";
 
-cmdlist_entry_t cmdlist[] PROGMEM = {
+const cmdlist_entry_t cmdlist[] PROGMEM = {
        { nessie_str,          NULL, testrun_nessie_skein            },
        { performance_str,     NULL, performance_skein               },
        { test_str,            NULL, testrun_stdtest_skein           },