a lot of fixes

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

diff --git a/test_src/main-bmw-test.c b/test_src/main-bmw-test.c
index f46f39540a0a3d44c61c26aa84fd555ff7344e6b..a78e1a5d6304501459b700ec9dc9895852a762d8 100644 (file)
--- a/test_src/main-bmw-test.c
+++ b/test_src/main-bmw-test.c
@@ -28,14 +28,14 @@
 #include "bmw_small.h"
 #include "bmw_large.h"
 #include "cli.h"
-#include "hfal/hfal_bmw_small.h"
-#include "hfal/hfal_bmw_large.h"
+#include "hfal_bmw_small.h"
+#include "hfal_bmw_large.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>
@@ -44,7 +44,7 @@
 char* algo_name = "BlueMidnightWish";
 
 
-const hfdesc_t* algolist[] PROGMEM = {
+const hfdesc_t* const algolist[] PROGMEM = {
        (hfdesc_t*)&bmw224_desc,
        (hfdesc_t*)&bmw256_desc,
        (hfdesc_t*)&bmw384_desc,
@@ -156,7 +156,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_bmw            },
        { test_str,                    NULL, testrun_stdtest_bmw           },
        { testshort_str,               NULL, testshort                     },