Merge branch 'master' into fix_printf

[proxmark3-svn] / client / mifarehost.h

diff --git a/client/mifarehost.h b/client/mifarehost.h
index 7f9a2b45a785984e0cd5d5b58c68b3a37c789969..031dac1b6393c74d28ce6bcfef28ada56f249a01 100644 (file)
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -1,4 +1,4 @@
-// Merlok, 2011\r
+// Merlok, 2011, 2017\r
 // people from mifare@nethemba.com, 2010\r
 //\r
 // This code is licensed to you under the terms of the GNU GPL, version 2 or,\r
@@ -15,6 +15,11 @@
 #include <stdbool.h>\r
 #include "data.h"\r
 \r
+// defaults\r
+// timeout in units. (ms * 106)/10 or us*0.0106\r
+// 5 == 500us\r
+#define MF_CHKKEYS_DEFTIMEOUT          5\r
+\r
 // mfCSetBlock work flags\r
 #define CSETBLOCK_UID                          0x01\r
 #define CSETBLOCK_WUPC                         0x02\r
@@ -24,16 +29,23 @@
 #define CSETBLOCK_SINGLE_OPER                  0x1F\r
 #define CSETBLOCK_MAGIC_1B                     0x40\r
 \r
+typedef struct {\r
+       uint64_t Key[2];\r
+       int foundKey[2];\r
+} sector_t;\r
+\r
 extern char logHexFileName[FILE_PATH_SIZE];\r
 \r
 extern int mfDarkside(uint64_t *key);\r
 extern int mfnested(uint8_t blockNo, uint8_t keyType, uint8_t *key, uint8_t trgBlockNo, uint8_t trgKeyType, uint8_t *ResultKeys, bool calibrate);\r
 extern int mfCheckKeys (uint8_t blockNo, uint8_t keyType, bool clear_trace, uint8_t keycnt, uint8_t *keyBlock, uint64_t *key);\r
+extern int mfCheckKeysSec(uint8_t sectorCnt, uint8_t keyType, uint8_t timeout14a, bool clear_trace, uint8_t keycnt, uint8_t * keyBlock, sector_t * e_sector);\r
 \r
 extern int mfEmlGetMem(uint8_t *data, int blockNum, int blocksCount);\r
 extern int mfEmlSetMem(uint8_t *data, int blockNum, int blocksCount);\r
 \r
-extern int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID, bool wantWipe);\r
+extern int mfCWipe(uint32_t numSectors, bool gen1b, bool wantWipe, bool wantFill);\r
+extern int mfCSetUID(uint8_t *uid, uint8_t *atqa, uint8_t *sak, uint8_t *oldUID);\r
 extern int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWipe, uint8_t params);\r
 extern int mfCGetBlock(uint8_t blockNo, uint8_t *data, uint8_t params);\r
 \r
@@ -48,5 +60,6 @@ extern int saveTraceCard(void);
 extern int tryDecryptWord(uint32_t nt, uint32_t ar_enc, uint32_t at_enc, uint8_t *data, int len);\r
 \r
 extern int mfCIdentify();\r
+extern int DetectClassicPrng(void);\r
 \r
 #endif\r