Merge pull request #49 from micolous/less-verbose-mfsim

[proxmark3-svn] / client / cmdhfmf.h

diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index 45ba7cb1f261cfdf4d668ed20d5b80b64eedd1b6..d381a852b864d4651cbf4b38cefd2b747467f9c9 100644 (file)
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -16,30 +16,35 @@
 #include <string.h>\r
 #include <ctype.h>\r
 #include "proxmark3.h"\r
-#include "../common/iso14443crc.h"\r
+#include "iso14443crc.h"\r
 #include "data.h"\r
 #include "ui.h"\r
 #include "cmdparser.h"\r
-#include "../include/common.h"\r
+#include "common.h"\r
 #include "util.h"\r
-#include "mifarehost.h"\r
+//#include "mifarehost.h"\r
+#include "mifare.h" // nonces_t struct\r
+#include "cmdhfmfhard.h"\r
+#include "nonce2key/nonce2key.h"\r
 \r
 int CmdHFMF(const char *Cmd);\r
-
-int CmdHF14AMfDbg(const char* cmd);
-int CmdHF14AMfRdBl(const char* cmd);
-int CmdHF14AMfURdBl(const char* cmd);
-int CmdHF14AMfRdSc(const char* cmd);
-int CmdHF14SMfURdCard(const char* cmd);
-int CmdHF14AMfDump(const char* cmd);
-int CmdHF14AMfRestore(const char* cmd);
-int CmdHF14AMfWrBl(const char* cmd);
-int CmdHF14AMfUWrBl(const char* cmd);
-int CmdHF14AMfChk(const char* cmd);
-int CmdHF14AMifare(const char* cmd);
-int CmdHF14AMfNested(const char* cmd);
+\r
+int CmdHF14AMfDbg(const char* cmd);\r
+int CmdHF14AMfRdBl(const char* cmd);\r
+int CmdHF14AMfURdBl(const char* cmd);\r
+int CmdHF14AMfRdSc(const char* cmd);\r
+int CmdHF14SMfURdCard(const char* cmd);\r
+int CmdHF14AMfDump(const char* cmd);\r
+int CmdHF14AMfRestore(const char* cmd);\r
+int CmdHF14AMfWrBl(const char* cmd);\r
+int CmdHF14AMfUWrBl(const char* cmd);\r
+int CmdHF14AMfChk(const char* cmd);\r
+int CmdHF14AMifare(const char* cmd);\r
+int CmdHF14AMfNested(const char* cmd);\r
+int CmdHF14AMfNestedHard(const char *Cmd);\r
 int CmdHF14AMfSniff(const char* cmd);\r
 int CmdHF14AMf1kSim(const char* cmd);\r
+int CmdHF14AMfKeyBrute(const char *Cmd);\r
 int CmdHF14AMfEClear(const char* cmd);\r
 int CmdHF14AMfEGet(const char* cmd);\r
 int CmdHF14AMfESet(const char* cmd);\r
@@ -53,5 +58,8 @@ int CmdHF14AMfCGetBlk(const char* cmd);
 int CmdHF14AMfCGetSc(const char* cmd);\r
 int CmdHF14AMfCLoad(const char* cmd);\r
 int CmdHF14AMfCSave(const char* cmd);\r
-int GetCardSize();\r
+int CmdHf14MfDecryptBytes(const char *Cmd);\r
+\r
+void readerAttack(nonces_t data[], bool setEmulatorMem, bool showMaths);\r
+void printKeyTable( uint8_t sectorscnt, sector *e_sector );\r
 #endif\r