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

index 470af6a7a9edc9084ac3e5219be651ba76c61e0a..8355cd1946172da7c7cdf272938179bc95fef66a 100644 (file)

--- a/armsrc/mifarecmd.c

+++ b/armsrc/mifarecmd.c

@@ -19,6 +19,12 @@

#include "crc.h"\r

+// the block number for the ISO14443-4 PCB\r

+uint8_t pcb_blocknum = 0;\r

+// Deselect card by sending a s-block. the crc is precalced for speed\r

+static uint8_t deselect_cmd[] = {0xc2,0xe0,0xb4};\r

+\r

//-----------------------------------------------------------------------------\r

// Select, Authenticate, Read a MIFARE tag. \r

// read block\r

@@ -41,7 +47,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

pcs = &mpcs;\r

// clear trace\r

- iso14a_clear_trace();\r

+ clear_trace();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

LED_A_ON();\r

@@ -86,107 +92,90 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

LEDsoff();\r

}\r

+void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){\r

-void MifareUC_Auth1(uint8_t arg0, uint8_t *datain){\r

+ bool turnOffField = (arg0 == 1);\r

- byte_t isOK = 0;\r

- byte_t dataoutbuf[16] = {0x00};\r

- uint8_t uid[10] = {0x00};\r

- uint32_t cuid;\r

-\r

- LED_A_ON();\r

- LED_B_OFF();\r

- LED_C_OFF();\r

- \r

- iso14a_clear_trace();\r

+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r

+ clear_trace();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

- if(!iso14443a_select_card(uid, NULL, &cuid)) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("Can't select card");\r

+ if(!iso14443a_select_card(NULL, NULL, NULL)) {\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r

OnError(0);\r

return;\r

};\r

- if(mifare_ultra_auth1(cuid, dataoutbuf)){\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) \r

- Dbprintf("Authentication part1: Fail.");\r

+ if(!mifare_ultra_auth(keybytes)){\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication failed");\r

OnError(1);\r

return;\r

}\r

- isOK = 1;\r

- if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r

- DbpString("AUTH 1 FINISHED");\r

- \r

- cmd_send(CMD_ACK,isOK,cuid,0,dataoutbuf,11);\r

- LEDsoff();\r

-}\r

-void MifareUC_Auth2(uint32_t arg0, uint8_t *datain){\r

-\r

- uint32_t cuid = arg0;\r

- uint8_t key[16] = {0x00};\r

- byte_t isOK = 0;\r

- byte_t dataoutbuf[16] = {0x00};\r

- \r

- memcpy(key, datain, 16);\r

- \r

- LED_A_ON();\r

- LED_B_OFF();\r

- LED_C_OFF();\r

- \r

- if(mifare_ultra_auth2(cuid, key, dataoutbuf)){\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) \r

- Dbprintf("Authentication part2: Fail...");\r

- OnError(1);\r

- return; \r

+ if (turnOffField) {\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ LEDsoff();\r

}\r

- \r

- isOK = 1;\r

- if (MF_DBGLEVEL >= MF_DBG_EXTENDED)\r

- DbpString("AUTH 2 FINISHED");\r

- \r

- cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,11);\r

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

+ cmd_send(CMD_ACK,1,0,0,0,0);\r

}\r

-void MifareUReadBlock(uint8_t arg0,uint8_t *datain)\r

+// Arg0 = BlockNo,\r

+// Arg1 = UsePwd bool\r

+// datain = PWD bytes,\r

+void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)\r

{\r

uint8_t blockNo = arg0;\r

byte_t dataout[16] = {0x00};\r

- uint8_t uid[10] = {0x00};\r

- uint32_t cuid;\r

- \r

+ bool useKey = (arg1 == 1); //UL_C\r

+ bool usePwd = (arg1 == 2); //UL_EV1/NTAG\r

+\r

+ LEDsoff();\r

LED_A_ON();\r

- LED_B_OFF();\r

- LED_C_OFF();\r

- \r

- iso14a_clear_trace();\r

+ clear_trace();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

- \r

- int len = iso14443a_select_card(uid, NULL, &cuid);\r

+\r

+ int len = iso14443a_select_card(NULL, NULL, NULL);\r

if(!len) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%02X)",len);\r

OnError(1);\r

return;\r

- };\r

- \r

- len = mifare_ultra_readblock(cuid, blockNo, dataout);\r

- if(len) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");\r

+ }\r

+\r

+ // UL-C authentication\r

+ if ( useKey ) {\r

+ uint8_t key[16] = {0x00};\r

+ memcpy(key, datain, sizeof(key) );\r

+\r

+ if ( !mifare_ultra_auth(key) ) {\r

+ OnError(1);\r

+ return;\r

+ }\r

+\r

+ // UL-EV1 / NTAG authentication\r

+ if ( usePwd ) {\r

+ uint8_t pwd[4] = {0x00};\r

+ memcpy(pwd, datain, 4);\r

+ uint8_t pack[4] = {0,0,0,0};\r

+ if (!mifare_ul_ev1_auth(pwd, pack)) {\r

+ OnError(1);\r

+ return;\r

+ }\r

+ } \r

+\r

+ if( mifare_ultra_readblock(blockNo, dataout) ) {\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block error");\r

OnError(2);\r

return;\r

- };\r

- \r

- len = mifare_ultra_halt(cuid);\r

- if(len) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r

+ }\r

+\r

+ if( mifare_ultra_halt() ) {\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r

OnError(3);\r

return;\r

- };\r

- \r

- cmd_send(CMD_ACK,1,0,0,dataout,16);\r

+ }\r

+\r

+ cmd_send(CMD_ACK,1,0,0,dataout,16);\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LEDsoff();\r

}\r

@@ -213,7 +202,7 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

pcs = &mpcs;\r

// clear trace\r

- iso14a_clear_trace();\r

+ clear_trace();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

@@ -259,73 +248,98 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

LEDsoff();\r

}\r

-void MifareUReadCard(uint8_t arg0, int arg1, uint8_t *datain)\r

+void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)\r

{\r

- // params\r

- uint8_t sectorNo = arg0;\r

- int Pages = arg1;\r

- int count_Pages = 0;\r

- byte_t dataout[176] = {0x00};;\r

- uint8_t uid[10] = {0x00};\r

- uint32_t cuid;\r

+ // free eventually allocated BigBuf memory\r

+ BigBuf_free();\r

+ // clear trace\r

+ clear_trace();\r

- LED_A_ON();\r

- LED_B_OFF();\r

- LED_C_OFF();\r

+ // params\r

+ uint8_t blockNo = arg0;\r

+ uint16_t blocks = arg1;\r

+ bool useKey = (arg2 == 1); //UL_C\r

+ bool usePwd = (arg2 == 2); //UL_EV1/NTAG\r

+ uint32_t countblocks = 0;\r

+ uint8_t *dataout = BigBuf_malloc(CARD_MEMORY_SIZE);\r

+ if (dataout == NULL){\r

+ Dbprintf("out of memory");\r

+ OnError(1);\r

+ return;\r

+ }\r

- if (MF_DBGLEVEL >= MF_DBG_ALL) \r

- Dbprintf("Pages %d",Pages);\r

- \r

- iso14a_clear_trace();\r

+ LEDsoff();\r

+ LED_A_ON();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

- int len = iso14443a_select_card(uid, NULL, &cuid);\r

- \r

+ int len = iso14443a_select_card(NULL, NULL, NULL);\r

if (!len) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("Can't select card");\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card (RC:%d)",len);\r

OnError(1);\r

return;\r

}\r

+\r

+ // UL-C authentication\r

+ if ( useKey ) {\r

+ uint8_t key[16] = {0x00};\r

+ memcpy(key, datain, sizeof(key) );\r

+\r

+ if ( !mifare_ultra_auth(key) ) {\r

+ OnError(1);\r

+ return;\r

+ }\r

+\r

+ // UL-EV1 / NTAG authentication\r

+ if (usePwd) {\r

+ uint8_t pwd[4] = {0x00};\r

+ memcpy(pwd, datain, sizeof(pwd));\r

+ uint8_t pack[4] = {0,0,0,0};\r

+\r

+ if (!mifare_ul_ev1_auth(pwd, pack)){\r

+ OnError(1);\r

+ return; \r

+ }\r

+\r

+ for (int i = 0; i < blocks; i++){\r

+ if ((i*4) + 4 > CARD_MEMORY_SIZE) {\r

+ Dbprintf("Data exceeds buffer!!");\r

+ break;\r

+ }\r

- for (int i = 0; i < Pages; i++){\r

- \r

- len = mifare_ultra_readblock(cuid, sectorNo * 4 + i, dataout + 4 * i);\r

- \r

+ len = mifare_ultra_readblock(blockNo + i, dataout + 4 * i);\r

+\r

if (len) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("Read block %d error",i);\r

- OnError(2);\r

- return;\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Read block %d error",i);\r

+ // if no blocks read - error out\r

+ if (i==0){\r

+ OnError(2);\r

+ return;\r

+ } else {\r

+ //stop at last successful read block and return what we got\r

+ break;\r

+ }\r

} else {\r

- count_Pages++;\r

+ countblocks++;\r

}\r

- \r

- len = mifare_ultra_halt(cuid);\r

+\r

+ len = mifare_ultra_halt();\r

if (len) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR)\r

- Dbprintf("Halt error");\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Halt error");\r

OnError(3);\r

return;\r

}\r

- \r

- if (MF_DBGLEVEL >= MF_DBG_ALL) {\r

- Dbprintf("Pages read %d", count_Pages);\r

- }\r

- len = 16*4; //64 bytes\r

- \r

- // Read a UL-C\r

- if (Pages == 44 && count_Pages > 16) \r

- len = 176;\r

+ if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Blocks read %d", countblocks);\r

- cmd_send(CMD_ACK, 1, 0, 0, dataout, len); \r

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

+ countblocks *= 4;\r

+ cmd_send(CMD_ACK, 1, countblocks, BigBuf_max_traceLen(), 0, 0);\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ LEDsoff();\r

}\r

-\r

//-----------------------------------------------------------------------------\r

// Select, Authenticate, Write a MIFARE tag. \r

// read block\r

@@ -350,7 +364,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

pcs = &mpcs;\r

// clear trace\r

- iso14a_clear_trace();\r

+ clear_trace();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

@@ -400,94 +414,143 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

void MifareUWriteBlock(uint8_t arg0, uint8_t *datain)\r

{\r

- // params\r

- uint8_t blockNo = arg0;\r

+ uint8_t blockNo = arg0;\r

byte_t blockdata[16] = {0x00};\r

- memcpy(blockdata, datain,16);\r

- \r

- // variables\r

- byte_t isOK = 0;\r

+ memcpy(blockdata, datain, 16);\r

+\r

uint8_t uid[10] = {0x00};\r

- uint32_t cuid;\r

- iso14a_clear_trace();\r

- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r

- LED_A_ON();\r

- LED_B_OFF();\r

- LED_C_OFF();\r

-\r

- while (true) {\r

- if(!iso14443a_select_card(uid, NULL, &cuid)) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r

- break;\r

- };\r

-\r

- if(mifare_ultra_writeblock(cuid, blockNo, blockdata)) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r

- break;\r

- };\r

-\r

- if(mifare_ultra_halt(cuid)) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r

- break;\r

- };\r

- \r

- isOK = 1;\r

- break;\r

- }\r

- \r

- if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");\r

-\r

- cmd_send(CMD_ACK,isOK,0,0,0,0);\r

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

+ clear_trace();\r

+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

+\r

+ if(!iso14443a_select_card(uid, NULL, NULL)) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r

+ OnError(0);\r

+ return;\r

+ };\r

+\r

+ if(mifare_ultra_writeblock(blockNo, blockdata)) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r

+ OnError(0);\r

+ return; };\r

+\r

+ if(mifare_ultra_halt()) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r

+ OnError(0);\r

+ return;\r

+ };\r

+\r

+ if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");\r

+\r

+ cmd_send(CMD_ACK,1,0,0,0,0);\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ LEDsoff();\r

}\r

void MifareUWriteBlock_Special(uint8_t arg0, uint8_t *datain)\r

{\r

- // params\r

uint8_t blockNo = arg0;\r

byte_t blockdata[4] = {0x00};\r

- \r

+\r

memcpy(blockdata, datain,4);\r

+ \r

+ LEDsoff();\r

+ LED_A_ON();\r

+ clear_trace();\r

+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

- // variables\r

- byte_t isOK = 0;\r

- uint8_t uid[10] = {0x00};\r

- uint32_t cuid;\r

+ if(!iso14443a_select_card(NULL, NULL, NULL)) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r

+ OnError(0);\r

+ return;\r

+ };\r

+\r

+ if(mifare_ultra_special_writeblock(blockNo, blockdata)) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r

+ OnError(0);\r

+ return;\r

+ };\r

+\r

+ if(mifare_ultra_halt()) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r

+ OnError(0);\r

+ return;\r

+ };\r

+\r

+ if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");\r

- iso14a_clear_trace();\r

+ cmd_send(CMD_ACK,1,0,0,0,0);\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ LEDsoff();\r

+}\r

+\r

+void MifareUSetPwd(uint8_t arg0, uint8_t *datain){\r

+ \r

+ uint8_t pwd[16] = {0x00};\r

+ byte_t blockdata[4] = {0x00};\r

+ \r

+ memcpy(pwd, datain, 16);\r

+ \r

+ LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r

+ clear_trace();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

- LED_A_ON();\r

- LED_B_OFF();\r

- LED_C_OFF();\r

+ if(!iso14443a_select_card(NULL, NULL, NULL)) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r

+ OnError(0);\r

+ return;\r

+ };\r

- while (true) {\r

- if(!iso14443a_select_card(uid, NULL, &cuid)) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r

- break;\r

- };\r

+ blockdata[0] = pwd[7];\r

+ blockdata[1] = pwd[6];\r

+ blockdata[2] = pwd[5];\r

+ blockdata[3] = pwd[4];\r

+ if(mifare_ultra_special_writeblock( 44, blockdata)) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r

+ OnError(44);\r

+ return;\r

+ };\r

- if(mifare_ultra_special_writeblock(cuid, blockNo, blockdata)) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r

- break;\r

- };\r

+ blockdata[0] = pwd[3];\r

+ blockdata[1] = pwd[2];\r

+ blockdata[2] = pwd[1];\r

+ blockdata[3] = pwd[0];\r

+ if(mifare_ultra_special_writeblock( 45, blockdata)) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r

+ OnError(45);\r

+ return;\r

+ };\r

- if(mifare_ultra_halt(cuid)) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r

- break;\r

- };\r

+ blockdata[0] = pwd[15];\r

+ blockdata[1] = pwd[14];\r

+ blockdata[2] = pwd[13];\r

+ blockdata[3] = pwd[12];\r

+ if(mifare_ultra_special_writeblock( 46, blockdata)) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r

+ OnError(46);\r

+ return;\r

+ };\r

- isOK = 1;\r

- break;\r

- }\r

+ blockdata[0] = pwd[11];\r

+ blockdata[1] = pwd[10];\r

+ blockdata[2] = pwd[9];\r

+ blockdata[3] = pwd[8];\r

+ if(mifare_ultra_special_writeblock( 47, blockdata)) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Write block error");\r

+ OnError(47);\r

+ return;\r

+ }; \r

- if (MF_DBGLEVEL >= 2) DbpString("WRITE BLOCK FINISHED");\r

+ if(mifare_ultra_halt()) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r

+ OnError(0);\r

+ return;\r

+ };\r

- cmd_send(CMD_ACK,isOK,0,0,0,0);\r

+ cmd_send(CMD_ACK,1,0,0,0,0);\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LEDsoff();\r

}\r

@@ -529,14 +592,16 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

struct Crypto1State mpcs = {0, 0};\r

struct Crypto1State *pcs;\r

pcs = &mpcs;\r

- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

uint32_t auth1_time, auth2_time;\r

static uint16_t delta_time;\r

+ // free eventually allocated BigBuf memory\r

+ BigBuf_free();\r

// clear trace\r

- iso14a_clear_trace();\r

- iso14a_set_tracing(false);\r

+ clear_trace();\r

+ set_tracing(false);\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

@@ -707,7 +772,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LEDsoff();\r

- iso14a_set_tracing(TRUE);\r

+ set_tracing(TRUE);\r

}\r

//-----------------------------------------------------------------------------\r

@@ -736,8 +801,8 @@ void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

MF_DBGLEVEL = MF_DBG_NONE;\r

// clear trace\r

- iso14a_clear_trace();\r

- iso14a_set_tracing(TRUE);\r

+ clear_trace();\r

+ set_tracing(TRUE);\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

@@ -827,8 +892,8 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

uint8_t uid[10];\r

// clear trace\r

- iso14a_clear_trace();\r

- iso14a_set_tracing(false);\r

+ clear_trace();\r

+ set_tracing(false);\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

@@ -920,8 +985,8 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

uint8_t d_block[18] = {0x00};\r

uint32_t cuid;\r

- uint8_t *receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

// reset FPGA and LED\r

if (workFlags & 0x08) {\r

@@ -929,8 +994,8 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

LED_B_OFF();\r

LED_C_OFF();\r

- iso14a_clear_trace();\r

- iso14a_set_tracing(TRUE);\r

+ clear_trace();\r

+ set_tracing(TRUE);\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

}\r

@@ -1039,16 +1104,16 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

uint8_t data[18] = {0x00};\r

uint32_t cuid = 0;\r

- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

if (workFlags & 0x08) {\r

LED_A_ON();\r

LED_B_OFF();\r

LED_C_OFF();\r

- iso14a_clear_trace();\r

- iso14a_set_tracing(TRUE);\r

+ clear_trace();\r

+ set_tracing(TRUE);\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

}\r

@@ -1104,8 +1169,8 @@ void MifareCIdent(){

// variables\r

byte_t isOK = 1;\r

- uint8_t* receivedAnswer = get_bigbufptr_recvrespbuf();\r

- uint8_t *receivedAnswerPar = receivedAnswer + MAX_FRAME_SIZE;\r

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

ReaderTransmitBitsPar(wupC1,7,0, NULL);\r

if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r

@@ -1134,26 +1199,23 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){

uint8_t uid[10] = {0x00};\r

uint32_t cuid;\r

- iso14a_clear_trace();\r

+ clear_trace();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

int len = iso14443a_select_card(uid, NULL, &cuid);\r

if(!len) {\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) \r

- Dbprintf("Can't select card");\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r

OnError(1);\r

return;\r

};\r

if(mifare_desfire_des_auth1(cuid, dataout)){\r

- if (MF_DBGLEVEL >= MF_DBG_ERROR) \r

- Dbprintf("Authentication part1: Fail.");\r

+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Authentication part1: Fail.");\r

OnError(4);\r

return;\r

}\r

if (MF_DBGLEVEL >= MF_DBG_EXTENDED) DbpString("AUTH 1 FINISHED");\r

- \r

cmd_send(CMD_ACK,1,cuid,0,dataout, sizeof(dataout));\r

}\r

@@ -1171,7 +1233,7 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){

if( isOK) {\r

if (MF_DBGLEVEL >= MF_DBG_EXTENDED) \r

Dbprintf("Authentication part2: Failed"); \r

- OnError(4);\r

+ //OnError(4);\r

return;\r

}\r

@@ -1181,4 +1243,19 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){

cmd_send(CMD_ACK, isOK, 0, 0, dataout, sizeof(dataout));\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LEDsoff();\r

\ No newline at end of file

+}\r

+\r

+void OnSuccess(){\r

+ pcb_blocknum = 0;\r

+ ReaderTransmit(deselect_cmd, 3 , NULL);\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ LEDsoff();\r

+}\r

+\r

+void OnError(uint8_t reason){\r

+ pcb_blocknum = 0;\r

+ ReaderTransmit(deselect_cmd, 3 , NULL);\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ cmd_send(CMD_ACK,0,reason,0,0,0);\r

+ LEDsoff();\r

+}\r