FIX: a define which was wrong

[proxmark3-svn] / client / mifarehost.h

diff --git a/client/mifarehost.h b/client/mifarehost.h
index 9e026a55824527642af9fe331d74e35b5a2fcdf7..2355017cab9b03a4fdafbd0e2631f13a39940d6d 100644 (file)
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -15,68 +15,51 @@
 #include "cmdmain.h"\r
 #include "ui.h"\r
 #include "data.h"\r
 #include "cmdmain.h"\r
 #include "ui.h"\r
 #include "data.h"\r

-//#include "proxusb.h"\r

 #include "util.h"\r
 #include "nonce2key/nonce2key.h"\r
 #include "nonce2key/crapto1.h"\r
 #include "iso14443crc.h"\r
 #include "util.h"\r
 #include "nonce2key/nonce2key.h"\r
 #include "nonce2key/crapto1.h"\r
 #include "iso14443crc.h"\r

+#include "protocols.h"\r

 \r
 #define MEM_CHUNK               1000000\r
 #define NESTED_SECTOR_RETRY     10\r
 \r
 \r
 #define MEM_CHUNK               1000000\r
 #define NESTED_SECTOR_RETRY     10\r
 \r

-// mfCSetBlock work flags\r
-#define CSETBLOCK_UID                                  0x01\r
-#define CSETBLOCK_WUPC                                 0x02\r
-#define CSETBLOCK_HALT                                 0x04\r
-#define CSETBLOCK_INIT_FIELD           0x08\r
-#define CSETBLOCK_RESET_FIELD          0x10\r
-#define CSETBLOCK_SINGLE_OPER          0x1F\r
-\r

 // mifare tracer flags\r
 // mifare tracer flags\r

-#define TRACE_IDLE                                                     0x00\r
-#define TRACE_AUTH1                                                    0x01\r
-#define TRACE_AUTH2                                                    0x02\r
-#define TRACE_AUTH_OK                                          0x03\r
-#define TRACE_READ_DATA                                0x04\r
-#define TRACE_WRITE_OK                                 0x05\r
-#define TRACE_WRITE_DATA                               0x06\r
-\r
-#define TRACE_ERROR                                                    0xFF\r
+#define TRACE_IDLE                             0x00\r
+#define TRACE_AUTH1                            0x01\r
+#define TRACE_AUTH2                            0x02\r
+#define TRACE_AUTH_OK                  0x03\r
+#define TRACE_READ_DATA                0x04\r
+#define TRACE_WRITE_OK                 0x05\r
+#define TRACE_WRITE_DATA               0x06\r

 \r
 \r

-typedef struct fnVector { uint8_t blockNo, keyType; uint32_t uid, nt, ks1; } fnVector;\r
+#define TRACE_ERROR                            0xFF\r

 \r
 typedef struct {\r
        uint64_t Key[2];\r
        int foundKey[2];\r
 } sector;\r
  \r
 \r
 typedef struct {\r
        uint64_t Key[2];\r
        int foundKey[2];\r
 } sector;\r
  \r

-typedef struct {\r
-        uint64_t        *possibleKeys;\r
-        uint32_t        size;\r
-} pKeys;\r
-\r
-typedef struct {\r
-        uint64_t        key;\r
-        int             count;\r
-} countKeys;\r
-\r
-extern char logHexFileName[200];\r
+int compar_int(const void * a, const void * b);\r
+extern char logHexFileName[FILE_PATH_SIZE];\r

 \r
 \r

-int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys);\r
-int mfCheckKeys (uint8_t blockNo, uint8_t keyType, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);\r
+int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);\r
+int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);\r

 \r
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);\r
 int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);\r
 \r
 int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);\r
 int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);\r

+int mfEmlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth);\r

 \r
 \r

-int mfCSetUID(uint8_t *uid, uint8_t *oldUID, int wantWipe);\r
-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, int wantWipe, uint8_t params);\r
+int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, uint8_t wipecard);\r
+int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, uint8_t params);\r

 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);\r
 \r
 int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);\r
 \r

-int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);\r
-int mfTraceDecode(uint8_t *data_src, int len, uint32_t parity, bool wantSaveToEmlFile);\r
+int mfTraceInit(uint8_t *tuid, uint8_t uidlen, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);\r
+int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile);\r

 \r
 int isTraceCardEmpty(void);\r
 int isBlockEmpty(int blockN);\r
 int isBlockTrailer(int blockN);\r
 \r
 int isTraceCardEmpty(void);\r
 int isBlockEmpty(int blockN);\r
 int isBlockTrailer(int blockN);\r

-int loadTraceCard(uint8_t *tuid);\r
+int loadTraceCard(uint8_t *tuid, uint8_t uidlen);\r

 int saveTraceCard(void);\r
 int saveTraceCard(void);\r

+int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);\r