X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/981bd4292e1f6d898453479c7bad86480d0c959f..12f283833bc2a5c5ea62bdad3927d7f90ef49125:/armsrc/mifareutil.h

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h
index ad637ea0..468c5cce 100644
--- a/armsrc/mifareutil.h
+++ b/armsrc/mifareutil.h
@@ -12,11 +12,13 @@
 #ifndef __MIFAREUTIL_H
 #define __MIFAREUTIL_H
 
+#include "crapto1/crapto1.h"
+
 // mifare authentication
 #define CRYPT_NONE    0
 #define CRYPT_ALL     1
 #define CRYPT_REQUEST 2
-#define AUTH_FIRST    0
+#define AUTH_FIRST    0	
 #define AUTH_NESTED   2
 
 // mifare 4bit card answers
@@ -41,44 +43,51 @@ 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();
 
-//functions
-uint8_t* mifare_get_bigbufptr(void);
-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t *timing);
-int mifare_sendcmd_short_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t *data, uint8_t* amswer, uint8_t *timing);
-int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t * parptr, uint32_t *timing);
-
-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, \
-												uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested);
-int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, \
-													uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested, uint32_t * ntptr, uint32_t *timing);
-int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData); 
-int mifare_ultra_readblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData);
-int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
-int mifare_ultra_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData);
-int mifare_ultra_special_writeblock(uint32_t uid, uint8_t blockNo, uint8_t *blockData);
-int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid); 
-int mifare_ultra_halt(uint32_t uid);
-
-// crypto functions
-void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *receivedCmd, int len);
-void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, int len, uint32_t *par);
+//functions
+int mifare_sendcmd(uint8_t cmd, uint8_t *data, uint8_t data_size, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);
+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);
+
+// mifare classic
+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested);
+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);
+int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
+int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid); 
+int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);
+
+// Ultralight/NTAG...
+int mifare_ul_ev1_auth(uint8_t *key, uint8_t *pack);
+int mifare_ultra_auth(uint8_t *key);
+int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData);
+//int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData);
+int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData);
+int mifare_ultra_halt();
+
+// desfire
+int mifare_sendcmd_special(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer, uint8_t *answer_parity, uint32_t *timing);
+int mifare_sendcmd_special2(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t* data, uint8_t* answer,uint8_t *answer_parity, uint32_t *timing);
+int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData);
+int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData);
+
+// crypto functions
+void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *receivedCmd, int len);
+void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, uint16_t len, uint8_t *par);
 uint8_t mf_crypto1_encrypt4bit(struct Crypto1State *pcs, uint8_t data);
 
-// memory management
-uint8_t* mifare_get_bigbufptr(void);
-uint8_t* eml_get_bigbufptr_sendbuf(void);
-uint8_t* eml_get_bigbufptr_recbuf(void);
+// Mifare memory structure
+uint8_t NumBlocksPerSector(uint8_t sectorNo);
+uint8_t FirstBlockOfSector(uint8_t sectorNo);
 
 // emulator functions
 void emlClearMem(void);
@@ -87,7 +96,7 @@ void emlGetMem(uint8_t *data, int blockNum, int blocksCount);
 void emlGetMemBt(uint8_t *data, int bytePtr, int byteCount);
 uint64_t emlGetKey(int sectorNum, int keyType);
 int emlGetValBl(uint32_t *blReg, uint8_t *blBlock, int blockNum);
-int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum);
-int emlCheckValBl(int blockNum);
-
-#endif
+int emlSetValBl(uint32_t blReg, uint8_t blBlock, int blockNum);
+int emlCheckValBl(int blockNum);
+
+#endif