replace msleep() by thread signalling in comms.c

[proxmark3-svn] / armsrc / mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 8ffd5e897d9121ac808ce66346818dec480dfbb6..d8f2602e50014d63e54994257689de5d3024bb23 100644 (file)
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -9,64 +9,43 @@
 // code for work with mifare cards.\r
 //-----------------------------------------------------------------------------\r
 \r
-#ifndef __MIFAREUTIL_H\r
-#define __MIFAREUTIL_H\r
+#ifndef MIFAREUTIL_H__\r
+#define MIFAREUTIL_H__\r
+\r
+#include <stdint.h>\r
+#include <stdbool.h>\r
 \r
 #include "crapto1/crapto1.h"\r
 #include "usb_cdc.h"\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
-#define AUTHENTICATION_TIMEOUT 848                     // card times out 1ms after wrong authentication (according to NXP documentation)\r
-#define PRE_AUTHENTICATION_LEADTIME 400                // some (non standard) cards need a pause after select before they are ready for first authentication\r
-\r
-// mifare 4bit card answers\r
-#define CARD_ACK      0x0A  // 1010 - ACK\r
-#define CARD_NACK_NA  0x04  // 0100 - NACK, not allowed (command not allowed)\r
-#define CARD_NACK_TR  0x05  // 0101 - NACK, transmission error\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
 // reader voltage field detector\r
 #define MF_MINFIELDV      4000\r
 \r
 // debug\r
-// 0 - no debug messages 1 - error messages 2 - all messages 4 - extended debug mode\r
-#define MF_DBG_NONE          0\r
-#define MF_DBG_ERROR         1\r
-#define MF_DBG_ALL           2\r
-#define MF_DBG_EXTENDED      4\r
+#define MF_DBG_NONE          0  // no messages\r
+#define MF_DBG_ERROR         1  // errors only\r
+#define MF_DBG_INFO          2  // errors + info messages\r
+#define MF_DBG_DEBUG         3  // errors + info + debug messages\r
+#define MF_DBG_EXTENDED      4  // errors + info + debug + breaking debug messages\r
 \r
 extern int MF_DBGLEVEL;\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\r
 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);\r
 \r
 // 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);\r
+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested, uint32_t *auth_timeout);\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, uint32_t *auth_timeout);\r
 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(struct Crypto1State *pcs, uint32_t uid);\r
 int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);\r
 \r
 // Ultralight/NTAG...\r
@@ -85,12 +64,16 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData);
 \r
 // crypto functions\r
 void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *receivedCmd, int len);\r
+void mf_crypto1_decryptEx(struct Crypto1State *pcs, uint8_t *data_in, int len, uint8_t *data_out);\r
 void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par);\r
+void mf_crypto1_encryptEx(struct Crypto1State *pcs, uint8_t *data, uint8_t *in, 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
+bool IsSectorTrailer(uint8_t blockNo);\r
+uint8_t SectorTrailer(uint8_t blockNo);\r
 \r
 // emulator functions\r
 void emlClearMem(void);\r
@@ -104,8 +87,8 @@ int emlCheckValBl(int blockNum);
 \r
 // mifare check keys\r
 typedef uint8_t TKeyIndex[2][40];\r
-int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uint64_t ui64Key, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel);\r
-int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel);\r
-int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, uint8_t keyType, uint8_t debugLevel, TKeyIndex *keyIndex);\r
+int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uint64_t ui64Key, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel);\r
+int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel);\r
+int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, uint8_t keyType, uint32_t *auth_timeout, uint8_t debugLevel, TKeyIndex *keyIndex);\r
 \r
 #endif\r