Fix compile issues for mfkey32 and mfkey64 after Pull Request #380

diff --git a/client/mfkey.c b/client/mfkey.c
index 2ab15dcbd5ff89324a0fbf59311b83396b255ac5..0c72a37c84b1cd9d341ff75891ad5b57e69728c9 100644 (file)
--- a/client/mfkey.c
+++ b/client/mfkey.c
@@ -10,9 +10,9 @@
 // MIFARE Darkside hack
 //-----------------------------------------------------------------------------
 
 // MIFARE Darkside hack
 //-----------------------------------------------------------------------------
 

-#include "mifare.h"

 #include "mfkey.h"
 
 #include "mfkey.h"
 

+#include "mifare.h"

 #include "crapto1/crapto1.h"
 
 
 #include "crapto1/crapto1.h"
 
 

diff --git a/client/mfkey.h b/client/mfkey.h
index fb7f575b2ce53603d51b7c7c24a20b0b818df719..be32fe1bd890a8c9bd827907b0cf74e28f940a00 100644 (file)
--- a/client/mfkey.h
+++ b/client/mfkey.h
@@ -15,6 +15,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
 
 #include <stdint.h>
 #include <stdbool.h>

+#include "mifare.h"

 
 extern bool mfkey32(nonces_t data, uint64_t *outputkey);
 extern bool mfkey32_moebius(nonces_t data, uint64_t *outputkey);
 
 extern bool mfkey32(nonces_t data, uint64_t *outputkey);
 extern bool mfkey32_moebius(nonces_t data, uint64_t *outputkey);

diff --git a/tools/mfkey/Makefile b/tools/mfkey/Makefile
index ede971dc7c9bc4cbf4680fd3e737f4ec1b02cb9a..92d3be720c848f3cd0a1f89db625c691b864d124 100755 (executable)
--- a/tools/mfkey/Makefile
+++ b/tools/mfkey/Makefile
@@ -1,7 +1,7 @@
 VPATH = ../../common ../../common/crapto1 ../../client
 CC = gcc
 LD = gcc
 VPATH = ../../common ../../common/crapto1 ../../client
 CC = gcc
 LD = gcc

-CFLAGS = -std=c99 -D_ISOC99_SOURCE -I../../common -I../../client -Wall -O3
+CFLAGS = -std=c99 -D_ISOC99_SOURCE -I../../include -I../../common -I../../client -Wall -O3

 LDFLAGS =
 
 OBJS = crypto1.o crapto1.o parity.o util_posix.o mfkey.o
 LDFLAGS =
 
 OBJS = crypto1.o crapto1.o parity.o util_posix.o mfkey.o