X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fmain-bmw-test.c;h=f46f39540a0a3d44c61c26aa84fd555ff7344e6b;hb=fb4cf7b5c6e5f28d886bd4216f09b8052c7bd013;hp=3228817a9358008dddcda6d5f0b3901f83e7d803;hpb=27e7d731ffb22116dba8c67cead51829d8ebe137;p=avr-crypto-lib.git

diff --git a/test_src/main-bmw-test.c b/test_src/main-bmw-test.c
index 3228817..f46f395 100644
--- a/test_src/main-bmw-test.c
+++ b/test_src/main-bmw-test.c
@@ -22,21 +22,20 @@
 */
 
 #include "config.h"
-#include "serial-tools.h"
 #include "uart_i.h"
 #include "debug.h"
 
 #include "bmw_small.h"
 #include "bmw_large.h"
 #include "cli.h"
-#include "hfal_bmw_small.h"
-#include "hfal_bmw_large.h"
+#include "hfal/hfal_bmw_small.h"
+#include "hfal/hfal_bmw_large.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal-nessie.h"
-#include "hfal-performance.h"
-#include "hfal-test.h"
+#include "hfal/hfal-nessie.h"
+#include "hfal/hfal-performance.h"
+#include "hfal/hfal-test.h"
 
 #include <stdint.h>
 #include <string.h>
@@ -155,20 +154,22 @@ const char echo_str[]        PROGMEM = "echo";
 const char shavs_list_str[]  PROGMEM = "shavs_list";
 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 = {
-	{ nessie_str,          NULL, testrun_nessie_bmw},
-	{ test_str,            NULL, testrun_stdtest_bmw},
-	{ testshort_str,       NULL, testshort},
-	{ testlshort_str,      NULL, testlshort},
-	{ test506_str,         NULL, test506},
-	{ test507_str,         NULL, test507},
-	{ performance_str,     NULL, performance_bmw},
-	{ shavs_list_str,      NULL, shavs_listalgos},
-	{ shavs_set_str,   (void*)1, (void_fpt)shavs_setalgo},
-	{ shavs_test1_str,     NULL, shavs_test1},
-	{ echo_str,        (void*)1, (void_fpt)echo_ctrl},
-	{ NULL,                NULL, NULL}
+	{ nessie_str,                  NULL, testrun_nessie_bmw            },
+	{ test_str,                    NULL, testrun_stdtest_bmw           },
+	{ testshort_str,               NULL, testshort                     },
+	{ testlshort_str,              NULL, testlshort                    },
+	{ test506_str,                 NULL, test506                       },
+	{ test507_str,                 NULL, test507                       },
+	{ performance_str,             NULL, performance_bmw               },
+	{ shavs_list_str,              NULL, shavs_listalgos               },
+	{ shavs_set_str,           (void*)1, (void_fpt)shavs_setalgo       },
+	{ shavs_test1_str,             NULL, shavs_test1                   },
+	{ shavs_test3_str,             NULL, shavs_test3                   },
+	{ echo_str,                (void*)1, (void_fpt)echo_ctrl           },
+	{ NULL,                        NULL, NULL                          }
 };
 
 int main (void){