syntax sugar

[proxmark3-svn] / client / mifarehost.h

diff --git a/client/mifarehost.h b/client/mifarehost.h
index 96eb75f7031b808035841c999a13085d813dad1d..e172bd391a4ec31008057c862c3bac139b3ebe65 100644 (file)
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -7,63 +7,81 @@
 //-----------------------------------------------------------------------------\r
 // High frequency ISO14443A commands\r
 //-----------------------------------------------------------------------------\r
 //-----------------------------------------------------------------------------\r
 // High frequency ISO14443A commands\r
 //-----------------------------------------------------------------------------\r

+#ifndef __MIFARE_HOST_H\r
+#define __MIFARE_HOST_H\r

 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <unistd.h>\r
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
 #include <unistd.h>\r

+#include <string.h>\r
+#include <pthread.h>\r
+\r
+#include "proxmark3.h" // time_t\r

 #include "common.h"\r
 #include "cmdmain.h"\r
 #include "ui.h"\r
 #include "data.h"\r
 #include "util.h"\r
 #include "common.h"\r
 #include "cmdmain.h"\r
 #include "ui.h"\r
 #include "data.h"\r
 #include "util.h"\r

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

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

+#include "protocols.h"\r

 \r
 \r

-#define MEM_CHUNK               1000000\r

 #define NESTED_SECTOR_RETRY     10\r
 \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
+#define TRACE_ERROR                            0xFF\r

 \r
 \r

+typedef struct {\r
+               union {\r
+                       struct Crypto1State *slhead;\r
+                       uint64_t *keyhead;\r
+               } head;\r
+               union {\r
+                       struct Crypto1State *sltail;\r
+                       uint64_t *keytail;\r
+               } tail;\r
+               uint32_t len;\r
+               uint32_t uid;\r
+               uint32_t blockNo;\r
+               uint32_t keyType;\r
+               uint32_t nt;\r
+               uint32_t ks1;\r
+} StateList_t;\r
+       \r

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

-} sector;\r
+} sector_t;\r

  \r
  \r

+extern int compar_int(const void * a, const void * b);\r

 extern char logHexFileName[FILE_PATH_SIZE];\r
 \r
 int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);\r
 extern char logHexFileName[FILE_PATH_SIZE];\r
 \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, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);\r
+int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, uint64_t * key);\r
+int mfKeyBrute(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint64_t *resultkey);\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, bool wantWipe);\r
-int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool 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 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
 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

-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
+#endif
\ No newline at end of file