#include "mifarecmd.h"\r
#include "apps.h"\r
#include "util.h"\r
-\r
#include "crc.h"\r
+#include "protocols.h"\r
\r
//-----------------------------------------------------------------------------\r
// Select, Authenticate, Read a MIFARE tag. \r
struct Crypto1State *pcs;\r
pcs = &mpcs;\r
\r
- // clear trace\r
- clear_trace();\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
+ clear_trace();\r
+\r
LED_A_ON();\r
LED_B_OFF();\r
LED_C_OFF();\r
bool turnOffField = (arg0 == 1);\r
\r
LED_A_ON(); LED_B_OFF(); LED_C_OFF();\r
- clear_trace();\r
+\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
+ clear_trace();\r
+\r
if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
OnError(0);\r
\r
LEDsoff();\r
LED_A_ON();\r
- clear_trace();\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
+ clear_trace();\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 (RC:%02X)",len);\r
struct Crypto1State *pcs;\r
pcs = &mpcs;\r
\r
- // clear trace\r
- clear_trace();\r
-\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
+ clear_trace();\r
+\r
LED_A_ON();\r
LED_B_OFF();\r
LED_C_OFF();\r
// datain = KEY bytes\r
void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)\r
{\r
+ LEDsoff();\r
+ LED_A_ON();\r
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
// free eventually allocated BigBuf memory\r
BigBuf_free();\r
clear_trace();\r
return;\r
}\r
\r
- LEDsoff();\r
- LED_A_ON();\r
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\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 (RC:%d)",len);\r
struct Crypto1State *pcs;\r
pcs = &mpcs;\r
\r
- // clear trace\r
- clear_trace();\r
-\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
+ clear_trace();\r
+\r
LED_A_ON();\r
LED_B_OFF();\r
LED_C_OFF();\r
\r
LEDsoff();\r
LED_A_ON();\r
- clear_trace();\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
\r
+ clear_trace();\r
+\r
if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
OnError(0);\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
\r
+ clear_trace();\r
+\r
if(!iso14443a_select_card(NULL, NULL, NULL)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
OnError(0);\r
uint32_t auth1_time, auth2_time;\r
static uint16_t delta_time;\r
\r
- // free eventually allocated BigBuf memory\r
- BigBuf_free();\r
- // clear trace\r
- clear_trace();\r
- set_tracing(false);\r
- \r
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r
LED_A_ON();\r
LED_C_OFF();\r
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+ // free eventually allocated BigBuf memory\r
+ BigBuf_free();\r
\r
+ if (calibrate) clear_trace();\r
+ set_tracing(true);\r
\r
// statistics on nonce distance\r
+ int16_t isOK = 0;\r
+ #define NESTED_MAX_TRIES 12\r
+ uint16_t unsuccessfull_tries = 0;\r
if (calibrate) { // for first call only. Otherwise reuse previous calibration\r
LED_B_ON();\r
WDT_HIT();\r
\r
for (rtr = 0; rtr < 17; rtr++) {\r
\r
+ // Test if the action was cancelled\r
+ if(BUTTON_PRESS()) {\r
+ isOK = -2;\r
+ break;\r
+ }\r
+\r
// prepare next select. No need to power down the card.\r
if(mifare_classic_halt(pcs, cuid)) {\r
if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Halt error");\r
delta_time = auth2_time - auth1_time + 32; // allow some slack for proper timing\r
}\r
if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);\r
+ } else {\r
+ unsuccessfull_tries++;\r
+ if (unsuccessfull_tries > NESTED_MAX_TRIES) { // card isn't vulnerable to nested attack (random numbers are not predictable)\r
+ isOK = -3;\r
+ }\r
}\r
}\r
- \r
- if (rtr <= 1) return;\r
\r
davg = (davg + (rtr - 1)/2) / (rtr - 1);\r
\r
- if (MF_DBGLEVEL >= 3) Dbprintf("min=%d max=%d avg=%d, delta_time=%d", dmin, dmax, davg, delta_time);\r
+ if (MF_DBGLEVEL >= 3) Dbprintf("rtr=%d isOK=%d min=%d max=%d avg=%d, delta_time=%d", rtr, isOK, dmin, dmax, davg, delta_time);\r
\r
dmin = davg - 2;\r
dmax = davg + 2;\r
\r
LED_B_OFF();\r
- \r
}\r
// ------------------------------------------------------------------------------------------------- \r
\r
LED_C_ON();\r
\r
// get crypted nonces for target sector\r
- for(i=0; i < 2; i++) { // look for exactly two different nonces\r
+ for(i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces\r
\r
target_nt[i] = 0;\r
while(target_nt[i] == 0) { // continue until we have an unambiguous nonce\r
memcpy(buf+16, &target_ks[1], 4);\r
\r
LED_B_ON();\r
- cmd_send(CMD_ACK, 0, 2, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));\r
+ cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));\r
LED_B_OFF();\r
\r
if (MF_DBGLEVEL >= 3) DbpString("NESTED FINISHED");\r
\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
- set_tracing(TRUE);\r
+ set_tracing(FALSE);\r
}\r
\r
//-----------------------------------------------------------------------------\r
// MIFARE check keys. key count up to 85. \r
// \r
//-----------------------------------------------------------------------------\r
-void MifareChkKeys(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
+void MifareChkKeys(uint16_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r
{\r
// params\r
- uint8_t blockNo = arg0;\r
- uint8_t keyType = arg1;\r
+ uint8_t blockNo = arg0 & 0xff;\r
+ uint8_t keyType = (arg0 >> 8) & 0xff;\r
+ bool clearTrace = arg1;\r
uint8_t keyCount = arg2;\r
uint64_t ui64Key = 0;\r
\r
int OLD_MF_DBGLEVEL = MF_DBGLEVEL; \r
MF_DBGLEVEL = MF_DBG_NONE;\r
\r
- // clear trace\r
- clear_trace();\r
- set_tracing(TRUE);\r
-\r
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r
LED_A_ON();\r
LED_B_OFF();\r
LED_C_OFF();\r
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+\r
+ if (clearTrace) clear_trace();\r
+ set_tracing(TRUE);\r
\r
for (i = 0; i < keyCount; i++) {\r
if(mifare_classic_halt(pcs, cuid)) {\r
\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
-\r
+ set_tracing(FALSE);\r
+ \r
// restore debug level\r
MF_DBGLEVEL = OLD_MF_DBGLEVEL; \r
}\r
//-----------------------------------------------------------------------------\r
// Work with emulator memory\r
// \r
+// Note: we call FpgaDownloadAndGo(FPGA_BITSTREAM_HF) here although FPGA is not\r
+// involved in dealing with emulator memory. But if it is called later, it might\r
+// destroy the Emulator Memory.\r
//-----------------------------------------------------------------------------\r
+\r
void MifareEMemClr(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
+ FpgaDownloadAndGo(FPGA_BITSTREAM_HF);\r
emlClearMem();\r
}\r
\r
void MifareEMemSet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
- emlSetMem(datain, arg0, arg1); // data, block num, blocks count\r
+ FpgaDownloadAndGo(FPGA_BITSTREAM_HF);\r
+ //emlSetMem(datain, arg0, arg1); // data, block num, blocks count \r
+ emlSetMem_xt(datain, arg0, arg1, arg2); // data, block num, blocks count, block byte width\r
}\r
\r
void MifareEMemGet(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
+ FpgaDownloadAndGo(FPGA_BITSTREAM_HF);\r
byte_t buf[USB_CMD_DATA_SIZE];\r
emlGetMem(buf, arg0, arg1); // data, block num, blocks count (max 4)\r
\r
byte_t dataoutbuf2[16];\r
uint8_t uid[10];\r
\r
- // clear trace\r
- clear_trace();\r
- set_tracing(false);\r
- \r
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
-\r
LED_A_ON();\r
LED_B_OFF();\r
LED_C_OFF();\r
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+ \r
+ clear_trace();\r
+ set_tracing(TRUE);\r
\r
bool isOK = true;\r
\r
\r
if (MF_DBGLEVEL >= 2) DbpString("EMUL FILL SECTORS FINISHED");\r
\r
+ set_tracing(FALSE);\r
}\r
\r
\r
//-----------------------------------------------------------------------------\r
// Work with "magic Chinese" card (email him: ouyangweidaxian@live.cn)\r
// \r
+// PARAMS - workFlags\r
+// bit 0 - need get UID\r
+// bit 1 - need wupC\r
+// bit 2 - need HALT after sequence\r
+// bit 3 - need turn on FPGA before sequence\r
+// bit 4 - need turn off FPGA\r
+// bit 5 - need to set datain instead of issuing USB reply (called via ARM for StandAloneMode14a)\r
+// bit 6 - wipe tag.\r
//-----------------------------------------------------------------------------\r
-void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
+// magic uid card generation 1 commands\r
+uint8_t wupC1[] = { MIFARE_MAGICWUPC1 }; \r
+uint8_t wupC2[] = { MIFARE_MAGICWUPC2 }; \r
+uint8_t wipeC[] = { MIFARE_MAGICWIPEC }; \r
+ \r
+void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){\r
\r
- // params\r
- uint8_t needWipe = arg0;\r
- // bit 0 - need get UID\r
- // bit 1 - need wupC\r
- // bit 2 - need HALT after sequence\r
- // bit 3 - need init FPGA and field before sequence\r
- // bit 4 - need reset FPGA and LED\r
- uint8_t workFlags = arg1;\r
- uint8_t blockNo = arg2;\r
+ // params\r
+ uint8_t workFlags = arg0;\r
+ uint8_t blockNo = arg1;\r
\r
- // card commands\r
- uint8_t wupC1[] = { 0x40 }; \r
- uint8_t wupC2[] = { 0x43 }; \r
- uint8_t wipeC[] = { 0x41 }; \r
+ Dbprintf("ICE :: CSetBlocks Flags %02x", workFlags);\r
\r
// variables\r
- byte_t isOK = 0;\r
uint8_t uid[10] = {0x00};\r
- uint8_t d_block[18] = {0x00};\r
+ uint8_t data[18] = {0x00};\r
uint32_t cuid;\r
\r
uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
\r
- // reset FPGA and LED\r
- if (workFlags & 0x08) {\r
+ if (workFlags & MAGIC_INIT) {\r
LED_A_ON();\r
LED_B_OFF();\r
- LED_C_OFF();\r
- \r
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
clear_trace();\r
set_tracing(TRUE);\r
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
}\r
\r
- while (true) {\r
-\r
- // get UID from chip\r
- if (workFlags & 0x01) {\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_classic_halt(NULL, cuid)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r
- //break;\r
- };\r
+ // read UID and return to client\r
+ if (workFlags & MAGIC_UID) {\r
+ if(!iso14443a_select_card(uid, NULL, &cuid)) {\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("Can't select card");\r
+ OnErrorMagic(MAGIC_UID);\r
};\r
+ };\r
\r
- // reset chip\r
- if (needWipe){\r
- ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
- if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error");\r
- break;\r
- };\r
-\r
- ReaderTransmit(wipeC, sizeof(wipeC), NULL);\r
- if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("wipeC error");\r
- break;\r
- };\r
-\r
- if(mifare_classic_halt(NULL, cuid)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r
- break;\r
- };\r
- }; \r
+ // wipe tag, fill it with zeros\r
+ if (workFlags & MAGIC_WIPE){\r
+ ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");\r
+ OnErrorMagic(MAGIC_WIPE);\r
+ };\r
\r
- // write block\r
- if (workFlags & 0x02) {\r
- ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
- if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error");\r
- break;\r
- };\r
+ ReaderTransmit(wipeC, sizeof(wipeC), NULL);\r
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wipeC error");\r
+ OnErrorMagic(MAGIC_WIPE);\r
+ };\r
+ }; \r
\r
- ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
- if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("wupC2 error");\r
- break;\r
- };\r
- }\r
+ // write block\r
+ if (workFlags & MAGIC_WUPC) {\r
+ ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");\r
+ OnErrorMagic(MAGIC_WUPC);\r
+ };\r
\r
- if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("write block send command error");\r
- break;\r
+ ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC2 error");\r
+ OnErrorMagic(MAGIC_WUPC);\r
};\r
+ }\r
+\r
+ if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_WRITEBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != 0x0a)) {\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("write block send command error");\r
+ OnErrorMagic(4);\r
+ };\r
\r
- memcpy(d_block, datain, 16);\r
- AppendCrc14443a(d_block, 16);\r
+ memcpy(data, datain, 16);\r
+ AppendCrc14443a(data, 16);\r
\r
- ReaderTransmit(d_block, sizeof(d_block), NULL);\r
- if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("write block send data error");\r
- break;\r
- }; \r
+ ReaderTransmit(data, sizeof(data), NULL);\r
+ if ((ReaderReceive(receivedAnswer, receivedAnswerPar) != 1) || (receivedAnswer[0] != 0x0a)) {\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("write block send data error");\r
+ OnErrorMagic(0);\r
+ }; \r
\r
- if (workFlags & 0x04) {\r
- if (mifare_classic_halt(NULL, cuid)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r
- break;\r
- };\r
- }\r
- \r
- isOK = 1;\r
- break;\r
- }\r
+ if (workFlags & MAGIC_OFF) \r
+ mifare_classic_halt_ex(NULL);\r
\r
LED_B_ON();\r
- cmd_send(CMD_ACK,isOK,0,0,uid,4);\r
+ // check if uid is cuid?\r
+ cmd_send(CMD_ACK,1,0,0,uid,sizeof(uid));\r
LED_B_OFF();\r
\r
- if ((workFlags & 0x10) || (!isOK)) {\r
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
- LEDsoff();\r
- }\r
+ if (workFlags & MAGIC_OFF)\r
+ OnSuccessMagic();\r
}\r
\r
-\r
-void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r
- \r
- // params\r
- // bit 1 - need wupC\r
- // bit 2 - need HALT after sequence\r
- // bit 3 - need init FPGA and field before sequence\r
- // bit 4 - need reset FPGA and LED\r
+void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain){\r
+ \r
uint8_t workFlags = arg0;\r
- uint8_t blockNo = arg2;\r
- \r
- // card commands\r
- uint8_t wupC1[] = { 0x40 }; \r
- uint8_t wupC2[] = { 0x43 }; \r
- \r
+ uint8_t blockNo = arg1;\r
+\r
// variables\r
- byte_t isOK = 0;\r
- uint8_t data[18] = {0x00};\r
- uint32_t cuid = 0;\r
- \r
+ uint8_t data[MAX_MIFARE_FRAME_SIZE];\r
uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
\r
- if (workFlags & 0x08) {\r
+ memset(data, 0x00, sizeof(data));\r
+ \r
+ if (workFlags & MAGIC_INIT) {\r
LED_A_ON();\r
LED_B_OFF();\r
- LED_C_OFF();\r
- \r
+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN); \r
clear_trace();\r
set_tracing(TRUE);\r
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
}\r
\r
- while (true) {\r
- if (workFlags & 0x02) {\r
- ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
- if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("wupC1 error");\r
- break;\r
- };\r
-\r
- ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
- if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("wupC2 error");\r
- break;\r
- };\r
- }\r
+ if (workFlags & MAGIC_WUPC) {\r
+ ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC1 error");\r
+ OnErrorMagic(MAGIC_WUPC);\r
+ };\r
\r
- // read block\r
- if ((mifare_sendcmd_short(NULL, 0, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("read block send command error");\r
- break;\r
+ ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r
+ if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("wupC2 error");\r
+ OnErrorMagic(MAGIC_WUPC);\r
};\r
- memcpy(data, receivedAnswer, 18);\r
- \r
- if (workFlags & 0x04) {\r
- if (mifare_classic_halt(NULL, cuid)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r
- break;\r
- };\r
- }\r
- \r
- isOK = 1;\r
- break;\r
}\r
+\r
+ // read block \r
+ if ((mifare_sendcmd_short(NULL, 0, ISO14443A_CMD_READBLOCK, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {\r
+ if (MF_DBGLEVEL >= MF_DBG_ERROR) Dbprintf("read block send command error");\r
+ OnErrorMagic(0);\r
+ };\r
+ \r
+ memcpy(data, receivedAnswer, sizeof(data));\r
+ \r
+ // send HALT\r
+ if (workFlags & MAGIC_HALT) \r
+ mifare_classic_halt_ex(NULL);\r
\r
LED_B_ON();\r
- cmd_send(CMD_ACK,isOK,0,0,data,18);\r
+ \r
+ // if MAGIC_DATAIN, the data stays on device side.\r
+ if (workFlags & MAGIC_DATAIN)\r
+ memcpy(datain, data, sizeof(data));\r
+ else\r
+ cmd_send(CMD_ACK,1,0,0,data,sizeof(data));\r
+ \r
LED_B_OFF();\r
\r
- if ((workFlags & 0x10) || (!isOK)) {\r
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
- LEDsoff();\r
- }\r
+ if (workFlags & MAGIC_OFF)\r
+ OnSuccessMagic();\r
}\r
\r
void MifareCIdent(){\r
- \r
- // card commands\r
- uint8_t wupC1[] = { 0x40 }; \r
- uint8_t wupC2[] = { 0x43 }; \r
\r
// variables\r
- byte_t isOK = 1;\r
- \r
- uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r
- uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r
+ byte_t isOK = 1; \r
+ uint8_t receivedAnswer[1];\r
+ uint8_t receivedAnswerPar[1];\r
\r
ReaderTransmitBitsPar(wupC1,7,0, NULL);\r
if(!ReaderReceive(receivedAnswer, receivedAnswerPar) || (receivedAnswer[0] != 0x0a)) {\r
isOK = 0;\r
};\r
\r
- if (mifare_classic_halt(NULL, 0)) {\r
- isOK = 0;\r
- };\r
-\r
+ // removed the if, since some magic tags misbehavies and send an answer to it.\r
+ mifare_classic_halt(NULL, 0);\r
cmd_send(CMD_ACK,isOK,0,0,0,0);\r
}\r
\r
-void MifareCollectNonces(uint32_t arg0, uint32_t arg1){\r
-\r
- BigBuf_free();\r
-\r
- uint32_t iterations = arg0;\r
- uint8_t uid[10] = {0x00};\r
-\r
- uint8_t *response = BigBuf_malloc(MAX_MIFARE_FRAME_SIZE);\r
- uint8_t *responsePar = BigBuf_malloc(MAX_MIFARE_PARITY_SIZE);\r
-\r
- uint8_t mf_auth[] = { 0x60,0x00,0xf5,0x7b };\r
- \r
- // get memory from BigBuf.\r
- uint8_t *nonces = BigBuf_malloc(iterations * 4);\r
-\r
- LED_A_ON();\r
- LED_B_OFF();\r
- LED_C_OFF();\r
-\r
- clear_trace();\r
- set_tracing(TRUE);\r
- iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
- \r
- for (int i = 0; i < iterations; i++) {\r
- \r
- WDT_HIT();\r
-\r
- // Test if the action was cancelled\r
- if(BUTTON_PRESS()) break;\r
- \r
- // if(mifare_classic_halt(pcs, cuid)) {\r
- // if (MF_DBGLEVEL >= 1) Dbprintf("Halt error");\r
- //}\r
-\r
- if(!iso14443a_select_card(uid, NULL, NULL)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("Can't select card");\r
- continue;\r
- };\r
-\r
- // Transmit MIFARE_CLASSIC_AUTH.\r
- ReaderTransmit(mf_auth, sizeof(mf_auth), NULL);\r
-\r
- // Receive the (4 Byte) "random" nonce\r
- if (!ReaderReceive(response, responsePar)) {\r
- if (MF_DBGLEVEL >= 1) Dbprintf("Couldn't receive tag nonce");\r
- continue;\r
- } \r
- \r
- nonces[i*4] = bytes_to_num(response, 4);\r
- }\r
- \r
- int packLen = iterations * 4;\r
- int packSize = 0;\r
- int packNum = 0;\r
- while (packLen > 0) {\r
- packSize = MIN(USB_CMD_DATA_SIZE, packLen);\r
- LED_B_ON();\r
- cmd_send(CMD_ACK, 77, 0, packSize, nonces - packLen, packSize);\r
- LED_B_OFF();\r
-\r
- packLen -= packSize;\r
- packNum++;\r
- }\r
+void OnSuccessMagic(){\r
FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r
LEDsoff();\r
+ set_tracing(FALSE); \r
+}\r
+void OnErrorMagic(uint8_t reason){\r
+ // ACK, ISOK, reason,0,0,0\r
+ cmd_send(CMD_ACK,0,reason,0,0,0);\r
+ OnSuccessMagic();\r
+}\r
+\r
+void MifareCollectNonces(uint32_t arg0, uint32_t arg1){\r
}\r
\r
//\r
uint8_t uid[10] = {0x00};\r
uint32_t cuid = 0x00;\r
\r
- clear_trace();\r
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r
+ clear_trace();\r
\r
int len = iso14443a_select_card(uid, NULL, &cuid);\r
if(!len) {\r
projects / proxmark3-svn / blobdiff