git.zerfleddert.de Git - proxmark3-svn/blobdiff

diff --git a/armsrc/mifareutil.h b/armsrc/mifareutil.h

index 8539a7de45d16fec788be2422f17d257fae7e822..c34dc8f4d8983dfb89fb0e4ddd96fe43ce69491c 100644 (file)

--- a/armsrc/mifareutil.h

+++ b/armsrc/mifareutil.h

@@ -12,12 +12,20 @@

#ifndef __MIFAREUTIL_H\r

#define __MIFAREUTIL_H\r

\r

+#include <stdint.h>\r

+#include <stdbool.h>\r

+\r

+#include "crapto1/crapto1.h"\r

+#include "usb_cdc.h"\r

+\r

// mifare authentication\r

#define CRYPT_NONE 0\r

#define CRYPT_ALL 1\r

#define CRYPT_REQUEST 2\r

-#define AUTH_FIRST 0\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

@@ -36,51 +44,42 @@

\r

extern int MF_DBGLEVEL;\r

\r

-//mifare nested\r

-#define MEM_CHUNK 10000\r

-#define TRY_KEYS 50\r

-#define NS_TOLERANCE 10 // [distance avg-value, distance avg+value]\r

-#define NS_RETRIES_GETNONCE 15\r

-#define NES_MAX_INFO 5\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_AUTH1 4\r

-#define MFEMUL_AUTH2 5\r

-#define MFEMUL_WORK 6\r

-#define MFEMUL_WRITEBL2 7\r

-#define MFEMUL_INTREG_INC 8\r

-#define MFEMUL_INTREG_DEC 9\r

-#define MFEMUL_INTREG_REST 10\r

-#define MFEMUL_HALTED 11\r

-\r

-#define cardSTATE_TO_IDLE() cardSTATE = MFEMUL_IDLE; LED_B_OFF(); LED_C_OFF();\r

-\r

//functions\r

-uint8_t* mifare_get_bigbufptr(void);\r

-int mifare_sendcmd_short(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer);\r

-int mifare_sendcmd_shortex(struct Crypto1State *pcs, uint8_t crypted, uint8_t cmd, uint8_t data, uint8_t* answer, uint32_t * parptr);\r

-\r

-int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, \\r

- uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested);\r

-int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, \\r

- uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint64_t isNested, uint32_t * ntptr);\r

-int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData); \r

-int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);\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

+\r

+// mifare classic\r

+int mifare_classic_auth(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t keyType, uint64_t ui64Key, uint8_t isNested);\r

+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);\r

+int mifare_classic_readblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);\r

int mifare_classic_halt(struct Crypto1State *pcs, uint32_t uid); \r

+int mifare_classic_writeblock(struct Crypto1State *pcs, uint32_t uid, uint8_t blockNo, uint8_t *blockData);\r

+\r

+// Ultralight/NTAG...\r

+int mifare_ul_ev1_auth(uint8_t *key, uint8_t *pack);\r

+int mifare_ultra_auth(uint8_t *key);\r

+int mifare_ultra_readblock(uint8_t blockNo, uint8_t *blockData);\r

+//int mifare_ultra_writeblock_compat(uint8_t blockNo, uint8_t *blockData);\r

+int mifare_ultra_writeblock(uint8_t blockNo, uint8_t *blockData);\r

+int mifare_ultra_halt();\r

+\r

+// desfire\r

+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);\r

+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);\r

+int mifare_desfire_des_auth1(uint32_t uid, uint8_t *blockData);\r

+int mifare_desfire_des_auth2(uint32_t uid, uint8_t *key, uint8_t *blockData);\r

\r

// crypto functions\r

void mf_crypto1_decrypt(struct Crypto1State *pcs, uint8_t *receivedCmd, int len);\r

-void mf_crypto1_encrypt(struct Crypto1State *pcs, uint8_t *data, int len, uint32_t *par);\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

-// memory management\r

-uint8_t* mifare_get_bigbufptr(void);\r

-uint8_t* eml_get_bigbufptr_sendbuf(void);\r

-uint8_t* eml_get_bigbufptr_recbuf(void);\r

+// Mifare memory structure\r

+uint8_t NumBlocksPerSector(uint8_t sectorNo);\r

+uint8_t FirstBlockOfSector(uint8_t sectorNo);\r

+bool IsSectorTrailer(uint8_t blockNo);\r

+uint8_t SectorTrailer(uint8_t blockNo);\r

\r

// emulator functions\r

void emlClearMem(void);\r

@@ -92,4 +91,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

-#endif

\ No newline at end of file

+// 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