Check keys in hf mf nested and hf mf chk (#414)

[proxmark3-svn] / armsrc / mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 468c5ccea053efdcaaa3463590255862d46df7cd..8ffd5e897d9121ac808ce66346818dec480dfbb6 100644 (file)
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -13,6 +13,7 @@
 #define __MIFAREUTIL_H\r
 \r
 #include "crapto1/crapto1.h"\r
 #define __MIFAREUTIL_H\r
 \r
 #include "crapto1/crapto1.h"\r

+#include "usb_cdc.h"\r

 \r
 // mifare authentication\r
 #define CRYPT_NONE    0\r
 \r
 // mifare authentication\r
 #define CRYPT_NONE    0\r


@@ -20,6 +21,8 @@
 #define CRYPT_REQUEST 2\r
 #define AUTH_FIRST    0        \r
 #define AUTH_NESTED   2\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
 \r
 // mifare 4bit card answers\r
 #define CARD_ACK      0x0A  // 1010 - ACK\r


@@ -99,4 +102,10 @@ int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum);
 int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum);\r
 int emlCheckValBl(int blockNum);\r
 \r
 int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum);\r
 int emlCheckValBl(int blockNum);\r
 \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
+\r

 #endif\r
 #endif\r