fix hf mf sim (issue #412) (#419)

[proxmark3-svn] / armsrc / mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index 8ffd5e897d9121ac808ce66346818dec480dfbb6..645d0e7dff08d1cecb8cc06fd4cdfd152cc079de 100644 (file)
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -41,23 +41,6 @@
 \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
@@ -85,6 +68,7 @@ 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
 uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data);\r
 \r