X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/90858b95ad0ae44ed2fdf2e7525c170135ce00b7..275d9e61c245e65fe09ccb5c49f09dfe505a642d:/armsrc/mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 7a09ce64..8ffd5e89 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -8,17 +8,21 @@
 //-----------------------------------------------------------------------------
 // code for work with mifare cards.
 //-----------------------------------------------------------------------------
-#include "crapto1.h"
 
 #ifndef __MIFAREUTIL_H
 #define __MIFAREUTIL_H
 
+#include "crapto1/crapto1.h"
+#include "usb_cdc.h"
+
 // mifare authentication
 #define CRYPT_NONE    0
 #define CRYPT_ALL     1
 #define CRYPT_REQUEST 2
 #define AUTH_FIRST    0	
 #define AUTH_NESTED   2
+#define AUTHENTICATION_TIMEOUT 848			// card times out 1ms after wrong authentication (according to NXP documentation)
+#define PRE_AUTHENTICATION_LEADTIME 400		// some (non standard) cards need a pause after select before they are ready for first authentication
 
 // mifare 4bit card answers
 #define CARD_ACK      0x0A  // 1010 - ACK
@@ -42,14 +46,15 @@ extern int MF_DBGLEVEL;
 #define MFEMUL_IDLE         1
 #define MFEMUL_SELECT1      2
 #define MFEMUL_SELECT2      3
-#define MFEMUL_AUTH1        4
-#define MFEMUL_AUTH2        5
-#define MFEMUL_WORK	        6
-#define MFEMUL_WRITEBL2     7
-#define MFEMUL_INTREG_INC   8
-#define MFEMUL_INTREG_DEC   9
-#define MFEMUL_INTREG_REST 10
-#define MFEMUL_HALTED      11
+#define MFEMUL_SELECT3      4
+#define MFEMUL_AUTH1        5
+#define MFEMUL_AUTH2        6
+#define MFEMUL_WORK	        7
+#define MFEMUL_WRITEBL2     8
+#define MFEMUL_INTREG_INC   9
+#define MFEMUL_INTREG_DEC  10
+#define MFEMUL_INTREG_REST 11
+#define MFEMUL_HALTED      12
 
 #define cardSTATE_TO_IDLE() cardSTATE = MFEMUL_IDLE; LED_B_OFF(); LED_C_OFF();
 
@@ -97,4 +102,10 @@ int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum);
 int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum);
 int emlCheckValBl(int blockNum);
 
+// mifare check keys
+typedef uint8_t TKeyIndex[2][40];
+int MifareChkBlockKey(uint8_t *uid, uint32_t *cuid, uint8_t *cascade_levels, uint64_t ui64Key, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel);
+int MifareChkBlockKeys(uint8_t *keys, uint8_t keyCount, uint8_t blockNo, uint8_t keyType, uint8_t debugLevel);
+int MifareMultisectorChk(uint8_t *keys, uint8_t keyCount, uint8_t SectorCount, uint8_t keyType, uint8_t debugLevel, TKeyIndex *keyIndex);
+
 #endif