fix 'hf iclass sim':

[proxmark3-svn] / armsrc / mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index c34dc8f4d8983dfb89fb0e4ddd96fe43ce69491c..856040ca527c6adedc419f9cb16994cc5b0ad8c1 100644 (file)
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -24,23 +24,16 @@
 #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
 \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
@@ -73,6 +66,7 @@ int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData);
 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