//-----------------------------------------------------------------------------\r
// High frequency ISO14443A commands\r
//-----------------------------------------------------------------------------\r
//-----------------------------------------------------------------------------\r
// High frequency ISO14443A commands\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
-#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
int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t * key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t * ResultKeys, bool calibrate);\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 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 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