fix: 32bit tick timer based on TC0 and TC1 (#653)

[proxmark3-svn] / client / mifarehost.h

diff --git a/client/mifarehost.h b/client/mifarehost.h
index 118d55cca5f6a4d07cc8b65e2d1eefcf72f2ecb9..6a37fef1273b6ca5da7848178c115060dc5997a4 100644 (file)
--- a/client/mifarehost.h
+++ b/client/mifarehost.h
@@ -13,7 +13,8 @@
 \r
 #include <stdint.h>\r
 #include <stdbool.h>\r
 \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
 \r
 // defaults\r
 // timeout in units. (ms * 106)/10 or us*0.0106\r


@@ -50,7 +51,7 @@ extern int mfCSetBlock(uint8_t blockNo, uint8_t *data, uint8_t *uid, bool wantWi
 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 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
 \r
 extern int isTraceCardEmpty(void);\r
 extern int isBlockEmpty(int blockN);\r


@@ -60,5 +61,8 @@ 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 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
 \r
 #endif\r