CHG: this timing should be quite good. needs to be verified.

[proxmark3-svn] / client / cmdhfmf.h

diff --git a/client/cmdhfmf.h b/client/cmdhfmf.h
index 19adbe304e78942564ab773f67775cf8bf420928..738b343251e390e9e5d408dff2a3703a9b288fd5 100644 (file)
--- a/client/cmdhfmf.h
+++ b/client/cmdhfmf.h
@@ -22,7 +22,10 @@
 #include "cmdparser.h"\r
 #include "common.h"\r
 #include "util.h"\r
 #include "cmdparser.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
 
 \r
 int CmdHFMF(const char *Cmd);\r
 


@@ -38,8 +41,10 @@ int CmdHF14AMfUWrBl(const char* cmd);
 int CmdHF14AMfChk(const char* cmd);
 int CmdHF14AMifare(const char* cmd);
 int CmdHF14AMfNested(const char* cmd);
 int CmdHF14AMfChk(const char* cmd);
 int CmdHF14AMifare(const char* cmd);
 int CmdHF14AMfNested(const char* cmd);

+int CmdHF14AMfNestedHard(const char *Cmd);\r

 int CmdHF14AMfSniff(const char* cmd);\r
 int CmdHF14AMf1kSim(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
 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 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);\r
+void printKeyTable( uint8_t sectorscnt, sector *e_sector );\r

 #endif\r
 #endif\r