move mifare stuff to separate folder

client/Makefile

@@ -134,15 +134,15 @@ CMDSRCS = 	$(SRC_SMARTCARD) \
 			fido/cose.c \
 			fido/cbortools.c \
 			fido/fidocore.c \
-			mfkey.c \
+			mifare/mfkey.c \
 			loclass/cipher.c \
 			loclass/cipherutils.c \
 			loclass/ikeys.c \
 			loclass/elite_crack.c\
 			loclass/fileutils.c\
 			whereami.c\
-			mifarehost.c\
-			mifare4.c\
+			mifare/mifarehost.c\
+			mifare/mifare4.c\
 			parity.c\
 			crc.c \
 			crc16.c \

client/cmdhf14a.c

@@ -27,7 +27,7 @@
 #include "cmdmain.h"
 #include "mifare.h"
 #include "cmdhfmfu.h"
-#include "mifarehost.h"
+#include "mifare/mifarehost.h"
 #include "cliparser/cliparser.h"
 #include "emv/apduinfo.h"
 #include "emv/emvcore.h"

client/cmdhflist.c

@@ -24,8 +24,8 @@
 #include "parity.h"
 #include "protocols.h"
 #include "crapto1/crapto1.h"
-#include "mifarehost.h"
-#include "mifaredefault.h"
+#include "mifare/mifarehost.h"
+#include "mifare/mifaredefault.h"
 #include "usb_cmd.h"
 #include "pcsc.h"
 

client/cmdhfmf.c

@@ -23,13 +23,13 @@
 #include "util_posix.h"
 #include "usb_cmd.h"
 #include "ui.h"
-#include "mifarehost.h"
+#include "mifare/mifarehost.h"
 #include "mifare.h"
-#include "mfkey.h"
+#include "mifare/mfkey.h"
 #include "hardnested/hardnested_bf_core.h"
 #include "cliparser/cliparser.h"
 #include "cmdhf14a.h"
-#include "mifare4.h"
+#include "mifare/mifare4.h"
 
 #define NESTED_SECTOR_RETRY     10			// how often we try mfested() until we give up
 

client/cmdhfmf.h

@@ -11,8 +11,9 @@
 #ifndef CMDHFMF_H__
 #define CMDHFMF_H__
 
-#include "mifaredefault.h"
+#include "mifare/mifaredefault.h"
 
+extern int CmdHFMF(const char *Cmd);
 extern int CmdHFMF(const char *Cmd);
 
 extern int CmdHF14AMfDbg(const char* cmd);

client/cmdhfmfp.c

@@ -22,7 +22,7 @@
 #include "ui.h"
 #include "cmdhf14a.h"
 #include "mifare.h"
-#include "mifare4.h"
+#include "mifare/mifare4.h"
 #include "cliparser/cliparser.h"
 #include "crypto/libpcrypto.h"
 

client/cmdhfmfp.h

@@ -10,7 +10,7 @@
 #ifndef CMDHFMFP_H__
 #define CMDHFMFP_H__
 
-#include "mifaredefault.h"
+#include "mifare/mifaredefault.h"
 
 extern int CmdHFMFP(const char *Cmd);
 

client/scripting.c

@@ -19,7 +19,7 @@
 #include "usb_cmd.h"
 #include "cmdmain.h"
 #include "util.h"
-#include "mifarehost.h"
+#include "mifare/mifarehost.h"
 #include "../common/iso15693tools.h"
 #include "iso14443crc.h"
 #include "../common/crc16.h"