small fix

[proxmark3-svn] / client / mifarehost.h

diff --git a/client/mifarehost.h b/client/mifarehost.h
index c564444285fba1a8a76990c861a7e7616aecf42c..6a37fef1273b6ca5da7848178c115060dc5997a4 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
@@ -13,31 +13,45 @@
 \r
 #include <stdint.h>\r
 #include <stdbool.h>\r
-#include "data.h"\r
+#include "crapto1/crapto1.h"\r
+#include "util.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
-#define CSETBLOCK_HALT                                 0x04\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
+#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
 extern int mfTraceInit(uint8_t *tuid, uint8_t *atqa, uint8_t sak, bool wantSaveToEmlFile);\r
-extern int mfTraceDecode(uint8_t *data_src, int len, bool wantSaveToEmlFile);\r
+extern int mfTraceDecode(uint8_t *data_src, int len, uint8_t parity, bool wantSaveToEmlFile);\r
 \r
 extern int isTraceCardEmpty(void);\r
 extern int isBlockEmpty(int blockN);\r
@@ -46,4 +60,9 @@ extern int loadTraceCard(uint8_t *tuid);
 extern int saveTraceCard(void);\r
 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
+extern bool validate_prng_nonce(uint32_t nonce);\r
+extern void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *data, int len, bool isEncrypted);\r
+\r
 #endif\r