chg: `analyse chksum` - now respects the mask variable,

[proxmark3-svn] / armsrc / mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index ed2779fcd2f1f6995d3057b20ed94da20f281a0d..c07bc579e446cd08b362f4caf3c92884234b7256 100644 (file)
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -9,9 +9,88 @@
 // code for work with mifare cards.\r
 //-----------------------------------------------------------------------------\r
 \r
-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, \\r
-                        uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested);\r
-int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData); \r
-int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);\r
+#ifndef __MIFAREUTIL_H\r
+#define __MIFAREUTIL_H\r
+\r
+#include "proxmark3.h"\r
+#include "apps.h"\r
+#include "parity.h"\r
+#include "util.h"\r
+#include "string.h"\r
+#include "iso14443crc.h"\r
+#include "iso14443a.h"\r
+#include "crapto1.h"\r
+#include "des.h"\r
+#include "random.h"                    // fast_prand, prand\r
+\r
+// mifare authentication\r
+#define CRYPT_NONE    0\r
+#define CRYPT_ALL     1\r
+#define CRYPT_REQUEST 2\r
+#define AUTH_FIRST    0        \r
+#define AUTH_NESTED   2\r
+\r
+//mifare emulator states\r
+#define MFEMUL_NOFIELD      0\r
+#define MFEMUL_IDLE         1\r
+#define MFEMUL_SELECT1      2\r
+#define MFEMUL_SELECT2      3\r
+#define MFEMUL_SELECT3      4\r
+#define MFEMUL_AUTH1        5\r
+#define MFEMUL_AUTH2        6\r
+#define MFEMUL_WORK            7\r
+#define MFEMUL_WRITEBL2     8\r
+#define MFEMUL_INTREG_INC   9\r
+#define MFEMUL_INTREG_DEC   10\r
+#define MFEMUL_INTREG_REST  11\r
+#define MFEMUL_HALTED       12\r
+\r
+#define cardSTATE_TO_IDLE() cardSTATE = MFEMUL_IDLE; LED_B_OFF(); LED_C_OFF();\r
+\r
+//functions
+int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);\r
+int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);
+
+// mifare classic\r
+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested);\r
+int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t * ntptr, uint32_t *timing);
+int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);\r
 int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid); \r
+int mifare_classic_halt_ex(struct Crypto1State *pcs);\r
+int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);\r
+\r
+// Ultralight/NTAG...\r
+int mifare_ul_ev1_auth(uint8_t *key, uint8_t *pack);\r
+int mifare_ultra_auth(uint8_t *key);\r
+int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData);\r
+//int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData);
+int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData);
+int mifare_ultra_halt();
+\r
+// desfire\r
+int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);\r
+int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer,uint8_t *answer_parity, uint32_t *timing);\r
+int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData);\r
+int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData);\r
+
+// crypto functions
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *receivedCmd, int len);
+void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par);\r
+uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data);\r
+\r
+// Mifare memory structure\r
+uint8_t NumBlocksPerSector(uint8_t sectorNo);\r
+uint8_t FirstBlockOfSector(uint8_t sectorNo);\r
 \r
+// emulator functions\r
+void emlClearMem(void);\r
+void emlSetMem(uint8_t *data, int blockNum, int blocksCount);\r
+void emlSetMem_xt(uint8_t *data, int blockNum, int blocksCount, int blockBtWidth);\r
+void emlGetMem(uint8_t *data, int blockNum, int blocksCount);\r
+void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount);\r
+uint64_t emlGetKey(int sectorNum, int keyType);\r
+int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum);\r
+int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum);
+int emlCheckValBl(int blockNum);
+
+#endif