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

index 39029d4e3429dcc2e4202aaf80e21477a99d4c84..bed2f0764c6073050e854083dfb7f2182a8ed959 100644 (file)

--- a/armsrc/mifarecmd.c

+++ b/armsrc/mifarecmd.c

@@ -15,29 +15,60 @@

#include "mifarecmd.h"\r

+#include <stdint.h>\r

+\r

+#include "proxmark3.h"\r

+#include "cmd.h"\r

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

+#include "iso14443a.h"\r

+#include "BigBuf.h"\r

+#include "mifareutil.h"\r

#include "apps.h"\r

+#include "protocols.h"\r

#include "util.h"\r

#include "parity.h"\r

#include "crc.h"\r

#include "util.h"\r

#include "parity.h"\r

#include "crc.h"\r

+#include "fpgaloader.h"\r

+#define HARDNESTED_AUTHENTICATION_TIMEOUT 848 // card times out 1ms after wrong authentication (according to NXP documentation)\r

+#define HARDNESTED_PRE_AUTHENTICATION_LEADTIME 400 // some (non standard) cards need a pause after select before they are ready for first authentication\r

+\r

+/*\r

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

static 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

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

static 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

+static void OnSuccess(){\r

+ pcb_blocknum = 0;\r

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

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ LEDsoff();\r

+}\r

+*/\r

+\r

+static void OnError(uint8_t reason){\r

+ // pcb_blocknum = 0;\r

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

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ LED_D_OFF();\r

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

+ LED_A_OFF();\r

+}\r

+\r

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

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

// read block\r

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

void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r

{\r

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

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

// read block\r

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

void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)\r

{\r

- // params\r

+ LED_A_ON();\r

+\r

uint8_t blockNo = arg0;\r

uint8_t keyType = arg1;\r

uint64_t ui64Key = 0;\r

ui64Key = bytes_to_num(datain, 6);\r

uint8_t blockNo = arg0;\r

uint8_t keyType = arg1;\r

uint64_t ui64Key = 0;\r

ui64Key = bytes_to_num(datain, 6);\r

- // variables\r

byte_t isOK = 0;\r

byte_t dataoutbuf[16];\r

uint8_t uid[10];\r

byte_t isOK = 0;\r

byte_t dataoutbuf[16];\r

uint8_t uid[10];\r

@@ -50,28 +81,24 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

clear_trace();\r

- LED_A_ON();\r

- LED_B_OFF();\r

- LED_C_OFF();\r

-\r

while (true) {\r

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

while (true) {\r

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

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

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

break;\r

};\r

if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r

break;\r

};\r

if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r

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

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

break;\r

};\r

if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {\r

break;\r

};\r

if(mifare_classic_readblock(pcs, cuid, blockNo, dataoutbuf)) {\r

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

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

break;\r

};\r

if(mifare_classic_halt(pcs, cuid)) {\r

break;\r

};\r

if(mifare_classic_halt(pcs, cuid)) {\r

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

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

break;\r

};\r

break;\r

};\r

@@ -82,7 +109,7 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

// ----------------------------- crypto1 destroy\r

crypto1_destroy(pcs);\r

// ----------------------------- crypto1 destroy\r

crypto1_destroy(pcs);\r

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

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

LED_B_ON();\r

cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r

LED_B_ON();\r

cmd_send(CMD_ACK,isOK,0,0,dataoutbuf,16);\r

@@ -94,21 +121,18 @@ void MifareReadBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

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

+ LED_A_ON();\r

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

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

-\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

- clear_trace();\r

-\r

- if(!iso14443a_select_card(NULL, NULL, NULL, true, 0, true)) {\r

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

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

OnError(0);\r

return;\r

};\r

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

OnError(0);\r

return;\r

};\r

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

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

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

OnError(1);\r

return;\r

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

OnError(1);\r

return;\r

@@ -116,9 +140,11 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){

if (turnOffField) {\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

if (turnOffField) {\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

+ LED_D_OFF();\r

}\r

+\r

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

+ LED_A_OFF();\r

}\r

// Arg0 = BlockNo,\r

}\r

// Arg0 = BlockNo,\r

@@ -126,17 +152,15 @@ void MifareUC_Auth(uint8_t arg0, uint8_t *keybytes){

// datain = PWD bytes,\r

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

{\r

// datain = PWD bytes,\r

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

{\r

+ LED_A_ON();\r

+\r

uint8_t blockNo = arg0;\r

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

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

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

uint8_t blockNo = arg0;\r

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

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

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

- LEDsoff();\r

- LED_A_ON();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

- clear_trace();\r

-\r

int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);\r

if(!len) {\r

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

int len = iso14443a_select_card(NULL, NULL, NULL, true, 0, true);\r

if(!len) {\r

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

@@ -145,7 +169,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)

}\r

// UL-C authentication\r

}\r

// UL-C authentication\r

- if ( useKey ) {\r

+ if (useKey) {\r

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

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

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

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

@@ -156,7 +180,7 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)

}\r

// UL-EV1 / NTAG authentication\r

}\r

// UL-EV1 / NTAG authentication\r

- if ( usePwd ) {\r

+ if (usePwd) {\r

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

memcpy(pwd, datain, 4);\r

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

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

memcpy(pwd, datain, 4);\r

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

@@ -166,13 +190,13 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)

}\r

- if( mifare_ultra_readblock(blockNo, dataout) ) {\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

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

OnError(2);\r

return;\r

}\r

- if( mifare_ultra_halt() ) {\r

+ if (mifare_ultra_halt()) {\r

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

OnError(3);\r

return;\r

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

OnError(3);\r

return;\r

@@ -180,7 +204,8 @@ void MifareUReadBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)

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

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

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

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

+ LED_D_OFF();\r

+ LED_A_OFF();\r

}\r

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

}\r

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

@@ -215,25 +240,25 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

isOK = 1;\r

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

isOK = 0;\r

isOK = 1;\r

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

isOK = 0;\r

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

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

}\r

if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {\r

isOK = 0;\r

}\r

if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {\r

isOK = 0;\r

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

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

}\r

for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r

if(mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) {\r

isOK = 0;\r

}\r

for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r

if(mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf + 16 * blockNo)) {\r

isOK = 0;\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Read sector %2d block %2d error", sectorNo, blockNo);\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Read sector %2d block %2d error", sectorNo, blockNo);\r

break;\r

}\r

if(mifare_classic_halt(pcs, cuid)) {\r

break;\r

}\r

if(mifare_classic_halt(pcs, cuid)) {\r

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

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

}\r

// ----------------------------- crypto1 destroy\r

}\r

// ----------------------------- crypto1 destroy\r

@@ -256,13 +281,11 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

// datain = KEY bytes\r

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

{\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

// free eventually allocated BigBuf memory\r

BigBuf_free();\r

LED_A_ON();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

// free eventually allocated BigBuf memory\r

BigBuf_free();\r

- clear_trace();\r

// params\r

uint8_t blockNo = arg0;\r

// params\r

uint8_t blockNo = arg0;\r

@@ -285,7 +308,7 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)

}\r

// UL-C authentication\r

}\r

// UL-C authentication\r

- if ( useKey ) {\r

+ if (useKey) {\r

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

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

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

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

@@ -337,14 +360,14 @@ void MifareUReadCard(uint8_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)

return;\r

}\r

return;\r

}\r

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

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

- countblocks *= 4;\r

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

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

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

+ LED_D_OFF();\r

BigBuf_free();\r

+ LED_A_OFF();\r

}\r

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

}\r

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

@@ -380,22 +403,22 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

while (true) {\r

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

while (true) {\r

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

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

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

break;\r

};\r

if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r

break;\r

};\r

if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST)) {\r

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

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

break;\r

};\r

if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {\r

break;\r

};\r

if(mifare_classic_writeblock(pcs, cuid, blockNo, blockdata)) {\r

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

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

break;\r

};\r

if(mifare_classic_halt(pcs, cuid)) {\r

break;\r

};\r

if(mifare_classic_halt(pcs, cuid)) {\r

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

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

break;\r

};\r

break;\r

};\r

@@ -406,7 +429,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

// ----------------------------- crypto1 destroy\r

crypto1_destroy(pcs);\r

// ----------------------------- crypto1 destroy\r

crypto1_destroy(pcs);\r

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

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

LED_B_ON();\r

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

LED_B_ON();\r

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

@@ -442,7 +465,7 @@ void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)

if(mifare_ultra_writeblock_compat(blockNo, blockdata)) {\r

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

OnError(0);\r

if(mifare_ultra_writeblock_compat(blockNo, blockdata)) {\r

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

OnError(0);\r

- return; };\r

+ return; };\r

if(mifare_ultra_halt()) {\r

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

if(mifare_ultra_halt()) {\r

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

@@ -659,7 +682,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,

if (!have_uid) { // need a full select cycle to get the uid first\r

iso14a_card_select_t card_info;\r

if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {\r

if (!have_uid) { // need a full select cycle to get the uid first\r

iso14a_card_select_t card_info;\r

if(!iso14443a_select_card(uid, &card_info, &cuid, true, 0, true)) {\r

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

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

continue;\r

}\r

switch (card_info.uidlen) {\r

continue;\r

}\r

switch (card_info.uidlen) {\r

@@ -671,33 +694,34 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,

have_uid = true;\r

} else { // no need for anticollision. We can directly select the card\r

if(!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels, true)) {\r

have_uid = true;\r

} else { // no need for anticollision. We can directly select the card\r

if(!iso14443a_select_card(uid, NULL, NULL, false, cascade_levels, true)) {\r

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

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

continue;\r

}\r

if (slow) {\r

continue;\r

}\r

if (slow) {\r

- timeout = GetCountSspClk() + PRE_AUTHENTICATION_LEADTIME;\r

+ timeout = GetCountSspClk() + HARDNESTED_PRE_AUTHENTICATION_LEADTIME;\r

while(GetCountSspClk() < timeout);\r

}\r

uint32_t nt1;\r

if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL)) {\r

while(GetCountSspClk() < timeout);\r

}\r

uint32_t nt1;\r

if (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL)) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Auth1 error");\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Auth1 error");\r

continue;\r

}\r

// nested authentication\r

uint16_t len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par_enc, NULL);\r

if (len != 4) {\r

continue;\r

}\r

// nested authentication\r

uint16_t len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par_enc, NULL);\r

if (len != 4) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Auth2 error len=%d", len);\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("AcquireNonces: Auth2 error len=%d", len);\r

continue;\r

}\r

continue;\r

}\r

- // send a dummy byte as reader response in order to trigger the cards authentication timeout\r

- uint8_t dummy_answer = 0;\r

- ReaderTransmit(&dummy_answer, 1, NULL);\r

- timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r

+ // send an incomplete dummy response in order to trigger the card's authentication failure timeout\r

+ uint8_t dummy_answer[1] = {0};\r

+ ReaderTransmit(dummy_answer, 1, NULL);\r

+\r

+ timeout = GetCountSspClk() + HARDNESTED_AUTHENTICATION_TIMEOUT;\r

num_nonces++;\r

if (num_nonces % 2) {\r

num_nonces++;\r

if (num_nonces % 2) {\r

@@ -723,7 +747,7 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,

cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r

LED_B_OFF();\r

cmd_send(CMD_ACK, isOK, cuid, num_nonces, buf, sizeof(buf));\r

LED_B_OFF();\r

- if (MF_DBGLEVEL >= 3) DbpString("AcquireEncryptedNonces finished");\r

+ if (MF_DBGLEVEL >= 3) DbpString("AcquireEncryptedNonces finished");\r

if (field_off) {\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

if (field_off) {\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

@@ -780,7 +804,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

int16_t isOK = 0;\r

#define NESTED_MAX_TRIES 12\r

uint16_t unsuccessfull_tries = 0;\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

+ if (calibrate) { // for first call only. Otherwise reuse previous calibration\r

LED_B_ON();\r

WDT_HIT();\r

LED_B_ON();\r

WDT_HIT();\r

@@ -798,20 +822,20 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

// prepare next select. No need to power down the card.\r

if(mifare_classic_halt(pcs, cuid)) {\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

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

rtr--;\r

continue;\r

}\r

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

rtr--;\r

continue;\r

}\r

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

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

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

rtr--;\r

continue;\r

};\r

auth1_time = 0;\r

if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {\r

rtr--;\r

continue;\r

};\r

auth1_time = 0;\r

if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth1 error");\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth1 error");\r

rtr--;\r

continue;\r

};\r

rtr--;\r

continue;\r

};\r

@@ -822,12 +846,12 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

auth2_time = 0;\r

}\r

if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {\r

auth2_time = 0;\r

}\r

if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2, &auth2_time)) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth2 error");\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth2 error");\r

rtr--;\r

continue;\r

};\r

rtr--;\r

continue;\r

};\r

- nttmp = prng_successor(nt1, 100); //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160\r

+ nttmp = prng_successor(nt1, 100); //NXP Mifare is typical around 840,but for some unlicensed/compatible mifare card this can be 160\r

for (i = 101; i < 1200; i++) {\r

nttmp = prng_successor(nttmp, 1);\r

if (nttmp == nt2) break;\r

for (i = 101; i < 1200; i++) {\r

nttmp = prng_successor(nttmp, 1);\r

if (nttmp == nt2) break;\r

@@ -845,7 +869,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

if (MF_DBGLEVEL >= 3) Dbprintf("Nested: calibrating... ntdist=%d", i);\r

} else {\r

unsuccessfull_tries++;\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

+ if (unsuccessfull_tries > NESTED_MAX_TRIES) { // card isn't vulnerable to nested attack (random numbers are not predictable)\r

isOK = -3;\r

}\r

isOK = -3;\r

}\r

@@ -873,18 +897,18 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

// prepare next select. No need to power down the card.\r

if(mifare_classic_halt(pcs, cuid)) {\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

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

continue;\r

}\r

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

continue;\r

}\r

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

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

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

continue;\r

};\r

auth1_time = 0;\r

if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {\r

continue;\r

};\r

auth1_time = 0;\r

if(mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time)) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth1 error");\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth1 error");\r

continue;\r

};\r

continue;\r

};\r

@@ -892,7 +916,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

auth2_time = auth1_time + delta_time;\r

len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);\r

if (len != 4) {\r

auth2_time = auth1_time + delta_time;\r

len = mifare_sendcmd_short(pcs, AUTH_NESTED, 0x60 + (targetKeyType & 0x01), targetBlockNo, receivedAnswer, par, &auth2_time);\r

if (len != 4) {\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth2 error len=%d", len);\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Nested: Auth2 error len=%d", len);\r

continue;\r

};\r

continue;\r

};\r

@@ -911,7 +935,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

ks1 = nt2 ^ nttest;\r

if (valid_nonce(nttest, nt2, ks1, par_array)){\r

ks1 = nt2 ^ nttest;\r

if (valid_nonce(nttest, nt2, ks1, par_array)){\r

- if (ncount > 0) { // we are only interested in disambiguous nonces, try again\r

+ if (ncount > 0) { // we are only interested in disambiguous nonces, try again\r

if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);\r

target_nt[i] = 0;\r

break;\r

if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: dismissed (ambigous), ntdist=%d", i+1, j);\r

target_nt[i] = 0;\r

break;\r

@@ -947,7 +971,7 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));\r

LED_B_OFF();\r

cmd_send(CMD_ACK, isOK, 0, targetBlockNo + (targetKeyType * 0x100), buf, sizeof(buf));\r

LED_B_OFF();\r

- if (MF_DBGLEVEL >= 3) DbpString("NESTED FINISHED");\r

+ if (MF_DBGLEVEL >= 3) DbpString("NESTED FINISHED");\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LEDsoff();\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LEDsoff();\r

@@ -966,51 +990,104 @@ void MifareChkKeys(uint16_t arg0, uint16_t arg1, uint8_t arg2, uint8_t *datain)

uint8_t set14aTimeout = (arg1 >> 8) & 0xff;\r

uint8_t keyCount = arg2;\r

uint8_t set14aTimeout = (arg1 >> 8) & 0xff;\r

uint8_t keyCount = arg2;\r

+ LED_A_ON();\r

+\r

// clear debug level\r

int OLD_MF_DBGLEVEL = MF_DBGLEVEL;\r

MF_DBGLEVEL = MF_DBG_NONE;\r

// clear debug level\r

int OLD_MF_DBGLEVEL = MF_DBGLEVEL;\r

MF_DBGLEVEL = MF_DBG_NONE;\r

- LED_A_ON();\r

- LED_B_OFF();\r

- LED_C_OFF();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

- if (clearTrace) clear_trace();\r

+ if (clearTrace) {\r

+ clear_trace();\r

+ }\r

set_tracing(true);\r

if (set14aTimeout){\r

iso14a_set_timeout(set14aTimeout * 10); // timeout: ms = x/106 35-minimum, 50-OK 106-recommended 500-safe\r

}\r

set_tracing(true);\r

if (set14aTimeout){\r

iso14a_set_timeout(set14aTimeout * 10); // timeout: ms = x/106 35-minimum, 50-OK 106-recommended 500-safe\r

}\r

- \r

+\r

if (multisectorCheck) {\r

TKeyIndex keyIndex = {{0}};\r

uint8_t sectorCnt = blockNo;\r

int res = MifareMultisectorChk(datain, keyCount, sectorCnt, keyType, OLD_MF_DBGLEVEL, &keyIndex);\r

if (multisectorCheck) {\r

TKeyIndex keyIndex = {{0}};\r

uint8_t sectorCnt = blockNo;\r

int res = MifareMultisectorChk(datain, keyCount, sectorCnt, keyType, OLD_MF_DBGLEVEL, &keyIndex);\r

- LED_B_ON();\r

if (res >= 0) {\r

cmd_send(CMD_ACK, 1, 0, 0, keyIndex, 80);\r

} else {\r

cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);\r

}\r

if (res >= 0) {\r

cmd_send(CMD_ACK, 1, 0, 0, keyIndex, 80);\r

} else {\r

cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);\r

}\r

- LED_B_OFF();\r

} else { \r

int res = MifareChkBlockKeys(datain, keyCount, blockNo, keyType, OLD_MF_DBGLEVEL);\r

} else { \r

int res = MifareChkBlockKeys(datain, keyCount, blockNo, keyType, OLD_MF_DBGLEVEL);\r

- LED_B_ON();\r

if (res > 0) {\r

cmd_send(CMD_ACK, 1, 0, 0, datain + (res - 1) * 6, 6);\r

} else {\r

cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);\r

}\r

if (res > 0) {\r

cmd_send(CMD_ACK, 1, 0, 0, datain + (res - 1) * 6, 6);\r

} else {\r

cmd_send(CMD_ACK, 0, 0, 0, NULL, 0);\r

}\r

- LED_B_OFF();\r

}\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

}\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

+ LED_D_OFF();\r

// restore debug level\r

MF_DBGLEVEL = OLD_MF_DBGLEVEL;\r

// restore debug level\r

MF_DBGLEVEL = OLD_MF_DBGLEVEL;\r

+ \r

+ LED_A_OFF();\r

+}\r

+\r

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

+// MIFARE Personalize UID. Only for Mifare Classic EV1 7Byte UID\r

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

+void MifarePersonalizeUID(uint8_t keyType, uint8_t perso_option, uint8_t *data) {\r

+\r

+ uint8_t uid[10];\r

+ uint32_t cuid;\r

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

+ struct Crypto1State *pcs;\r

+ pcs = &mpcs;\r

+\r

+ LED_A_ON();\r

+ clear_trace();\r

+\r

+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

+\r

+ bool isOK = false;\r

+ while (true) {\r

+ if (!iso14443a_select_card(uid, NULL, &cuid, true, 0, true)) {\r

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

+ break;\r

+ }\r

+\r

+ uint8_t block_number = 0;\r

+ uint64_t key = bytes_to_num(data, 6);\r

+ if (mifare_classic_auth(pcs, cuid, block_number, keyType, key, AUTH_FIRST)) {\r

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

+ break;\r

+ }\r

+\r

+ uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

+ uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

+ int len = mifare_sendcmd_short(pcs, true, MIFARE_EV1_PERSONAL_UID, perso_option, receivedAnswer, receivedAnswerPar, NULL);\r

+ if (len != 1 || receivedAnswer[0] != CARD_ACK) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Cmd Error: %02x", receivedAnswer[0]);\r

+ break;;\r

+ }\r

+ isOK = true;\r

+ break;\r

+ }\r

+\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ LED_D_OFF();\r

+\r

+ crypto1_destroy(pcs);\r

+\r

+ if (MF_DBGLEVEL >= 2) DbpString("PERSONALIZE UID FINISHED");\r

+\r

+ cmd_send(CMD_ACK, isOK, 0, 0, NULL, 0);\r

+\r

+ LED_A_OFF();\r

}\r

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

}\r

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

@@ -1080,7 +1157,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

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

isOK = false;\r

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

isOK = false;\r

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

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

}\r

for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {\r

}\r

for (uint8_t sectorNo = 0; isOK && sectorNo < numSectors; sectorNo++) {\r

@@ -1088,13 +1165,13 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

if (sectorNo == 0){\r

if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {\r

isOK = false;\r

if (sectorNo == 0){\r

if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST)) {\r

isOK = false;\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth error", sectorNo);\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth error", sectorNo);\r

break;\r

}\r

} else {\r

if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {\r

isOK = false;\r

break;\r

}\r

} else {\r

if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED)) {\r

isOK = false;\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth nested error", sectorNo);\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Sector[%2d]. Auth nested error", sectorNo);\r

break;\r

}\r

break;\r

}\r

@@ -1102,13 +1179,13 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r

if(isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {\r

isOK = false;\r

for (uint8_t blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {\r

if(isOK && mifare_classic_readblock(pcs, cuid, FirstBlockOfSector(sectorNo) + blockNo, dataoutbuf)) {\r

isOK = false;\r

- if (MF_DBGLEVEL >= 1) Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("Error reading sector %2d block %2d", sectorNo, blockNo);\r

break;\r

};\r

if (isOK) {\r

if (blockNo < NumBlocksPerSector(sectorNo) - 1) {\r

emlSetMem(dataoutbuf, FirstBlockOfSector(sectorNo) + blockNo, 1);\r

break;\r

};\r

if (isOK) {\r

if (blockNo < NumBlocksPerSector(sectorNo) - 1) {\r

emlSetMem(dataoutbuf, FirstBlockOfSector(sectorNo) + blockNo, 1);\r

- } else { // sector trailer, keep the keys, set only the AC\r

+ } else { // sector trailer, keep the keys, set only the AC\r

emlGetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);\r

memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);\r

emlSetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);\r

emlGetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);\r

memcpy(&dataoutbuf2[6], &dataoutbuf[6], 4);\r

emlSetMem(dataoutbuf2, FirstBlockOfSector(sectorNo) + blockNo, 1);\r

@@ -1119,7 +1196,7 @@ void MifareECardLoad(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

}\r

if(mifare_classic_halt(pcs, cuid)) {\r

}\r

if(mifare_classic_halt(pcs, cuid)) {\r

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

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

};\r

// ----------------------------- crypto1 destroy\r

};\r

// ----------------------------- crypto1 destroy\r

@@ -1145,7 +1222,7 @@ static bool isBlockTrailer(int blockN) {

if (blockN >= 128 && blockN <= 256) {\r

return ((blockN & 0x0F) == 0x0F);\r

}\r

if (blockN >= 128 && blockN <= 256) {\r

return ((blockN & 0x0F) == 0x0F);\r

}\r

- return FALSE;\r

+ return false;\r

}\r

void MifareCWipe(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r

}\r

void MifareCWipe(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){\r

@@ -1160,20 +1237,20 @@ void MifareCWipe(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){

bool needWipe = cmdParams & 0x01;\r

bool needFill = cmdParams & 0x02;\r

bool gen1b = cmdParams & 0x04;\r

bool needWipe = cmdParams & 0x01;\r

bool needFill = cmdParams & 0x02;\r

bool gen1b = cmdParams & 0x04;\r

- \r

+\r

uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

- \r

+\r

uint8_t block0[16] = {0x01, 0x02, 0x03, 0x04, 0x04, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBE, 0xAF};\r

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

uint8_t blockK[16] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x08, 0x77, 0x8F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r

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

uint8_t block0[16] = {0x01, 0x02, 0x03, 0x04, 0x04, 0x08, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBE, 0xAF};\r

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

uint8_t blockK[16] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x08, 0x77, 0x8F, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r

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

- \r

+\r

// card commands\r

uint8_t wupC1[] = { 0x40 };\r

uint8_t wupC2[] = { 0x43 };\r

uint8_t wipeC[] = { 0x41 };\r

// card commands\r

uint8_t wupC1[] = { 0x40 };\r

uint8_t wupC2[] = { 0x43 };\r

uint8_t wipeC[] = { 0x41 };\r

- \r

+\r

// iso14443 setup\r

LED_A_ON();\r

LED_B_OFF();\r

// iso14443 setup\r

LED_A_ON();\r

LED_B_OFF();\r

@@ -1183,54 +1260,54 @@ void MifareCWipe(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){

// tracing\r

clear_trace();\r

set_tracing(true);\r

// tracing\r

clear_trace();\r

set_tracing(true);\r

- \r

+\r

while (true){\r

// wipe\r

if (needWipe){\r

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

while (true){\r

// wipe\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

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

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

break;\r

};\r

ReaderTransmit(wipeC, sizeof(wipeC), NULL);\r

break;\r

};\r

ReaderTransmit(wipeC, sizeof(wipeC), NULL);\r

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

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

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

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

break;\r

};\r

if(mifare_classic_halt(NULL, 0)) {\r

break;\r

};\r

if(mifare_classic_halt(NULL, 0)) {\r

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

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

};\r

- \r

+\r

// put default data\r

if (needFill){\r

// select commands\r

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

// put default data\r

if (needFill){\r

// select commands\r

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

- // gen1b magic tag : do no issue wupC2 and don't expect 0x0a response after SELECT_UID (after getting UID from chip in 'hf mf csetuid' command)\r

- if (!gen1b) { \r

+ // gen1b magic tag : do no issue wupC2 and don't expect CARD_ACK response after SELECT_UID (after getting UID from chip in 'hf mf csetuid' command)\r

+ if (!gen1b) {\r

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

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

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

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

break;\r

};\r

ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r

break;\r

};\r

ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r

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

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

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

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

break;\r

};\r

}\r

// send blocks command\r

for (int blockNo = 0; blockNo < numBlocks; blockNo++) {\r

break;\r

};\r

}\r

// send blocks command\r

for (int blockNo = 0; blockNo < numBlocks; blockNo++) {\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

+ if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != CARD_ACK)) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("write block send command error");\r

break;\r

};\r

break;\r

};\r

- \r

+\r

// check type of block and add crc\r

if (!isBlockTrailer(blockNo)){\r

memcpy(d_block, block1, 16);\r

// check type of block and add crc\r

if (!isBlockTrailer(blockNo)){\r

memcpy(d_block, block1, 16);\r

@@ -1244,33 +1321,33 @@ void MifareCWipe(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain){

// send write command\r

ReaderTransmit(d_block, sizeof(d_block), NULL);\r

// send write command\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

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

+ if (MF_DBGLEVEL >= 1) Dbprintf("write block send data error");\r

break;\r

};\r

}\r

break;\r

};\r

}\r

- \r

+\r

// halt\r

- // do no issue halt command for gen1b \r

+ // do no issue halt command for gen1b\r

if (!gen1b) {\r

if (mifare_classic_halt(NULL, 0)) {\r

if (!gen1b) {\r

if (mifare_classic_halt(NULL, 0)) {\r

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

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

break;\r

}\r

break;\r

}\r

break;\r

- } \r

+ }\r

// send USB response\r

LED_B_ON();\r

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

LED_B_OFF();\r

// send USB response\r

LED_B_ON();\r

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

LED_B_OFF();\r

- \r

+\r

// reset fpga\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LEDsoff();\r

// reset fpga\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LEDsoff();\r

- \r

+\r

return;\r

}\r

return;\r

}\r

@@ -1317,13 +1394,13 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

// get UID from chip\r

if (workFlags & 0x01) {\r

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

// get UID from chip\r

if (workFlags & 0x01) {\r

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

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

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

// Continue, if we set wrong UID or wrong UID checksum or some ATQA or SAK we will can't select card. But we need to write block 0 to make card work.\r

//break;\r

};\r

if(mifare_classic_halt(NULL, cuid)) {\r

// Continue, if we set wrong UID or wrong UID checksum or some ATQA or SAK we will can't select card. But we need to write block 0 to make card work.\r

//break;\r

};\r

if(mifare_classic_halt(NULL, cuid)) {\r

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

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

// Continue, some magic tags misbehavies and send an answer to it.\r

// break;\r

};\r

// Continue, some magic tags misbehavies and send an answer to it.\r

// break;\r

};\r

@@ -1333,21 +1410,21 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

// Wipe command don't work with gen1b\r

if (needWipe && !(workFlags & 0x40)){\r

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

// Wipe command don't work with gen1b\r

if (needWipe && !(workFlags & 0x40)){\r

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

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

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

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

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

break;\r

};\r

ReaderTransmit(wipeC, sizeof(wipeC), NULL);\r

break;\r

};\r

ReaderTransmit(wipeC, sizeof(wipeC), NULL);\r

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

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

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

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

break;\r

};\r

if(mifare_classic_halt(NULL, 0)) {\r

break;\r

};\r

if(mifare_classic_halt(NULL, 0)) {\r

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

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

// Continue, some magic tags misbehavies and send an answer to it.\r

- // break;\r

+ // break;\r

};\r

@@ -1355,24 +1432,24 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

if (workFlags & 0x02) {\r

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

if (workFlags & 0x02) {\r

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

- // gen1b magic tag : do no issue wupC2 and don't expect 0x0a response after SELECT_UID (after getting UID from chip in 'hf mf csetuid' command)\r

+ // gen1b magic tag : do no issue wupC2 and don't expect CARD_ACK response after SELECT_UID (after getting UID from chip in 'hf mf csetuid' command)\r

if (!(workFlags & 0x40)) {\r

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

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

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

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

break;\r

};\r

ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r

break;\r

};\r

ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r

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

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

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

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

break;\r

};\r

}\r

break;\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

+ if ((mifare_sendcmd_short(NULL, 0, 0xA0, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 1) || (receivedAnswer[0] != CARD_ACK)) {\r

+ if (MF_DBGLEVEL >= 1) Dbprintf("write block send command error");\r

break;\r

};\r

break;\r

};\r

@@ -1380,8 +1457,8 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

AppendCrc14443a(d_block, 16);\r

ReaderTransmit(d_block, sizeof(d_block), NULL);\r

AppendCrc14443a(d_block, 16);\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

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

+ if (MF_DBGLEVEL >= 1) Dbprintf("write block send data error");\r

break;\r

};\r

break;\r

};\r

@@ -1389,7 +1466,7 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

// do no issue halt command for gen1b magic tag (#db# halt error. response len: 1)\r

if (!(workFlags & 0x40)) {\r

if (mifare_classic_halt(NULL, 0)) {\r

// do no issue halt command for gen1b magic tag (#db# halt error. response len: 1)\r

if (!(workFlags & 0x40)) {\r

if (mifare_classic_halt(NULL, 0)) {\r

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

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

// Continue, some magic tags misbehavies and send an answer to it.\r

// break;\r

}\r

// Continue, some magic tags misbehavies and send an answer to it.\r

// break;\r

}\r

@@ -1448,15 +1525,15 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

while (true) {\r

if (workFlags & 0x02) {\r

ReaderTransmitBitsPar(wupC1,7,0, NULL);\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

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

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

break;\r

};\r

// do no issue for gen1b magic tag\r

if (!(workFlags & 0x40)) {\r

ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r

break;\r

};\r

// do no issue for gen1b magic tag\r

if (!(workFlags & 0x40)) {\r

ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r

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

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

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

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

break;\r

};\r

}\r

break;\r

};\r

}\r

@@ -1464,7 +1541,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

// read block\r

if ((mifare_sendcmd_short(NULL, 0, 0x30, blockNo, receivedAnswer, receivedAnswerPar, NULL) != 18)) {\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

+ if (MF_DBGLEVEL >= 1) Dbprintf("read block send command error");\r

break;\r

};\r

memcpy(data, receivedAnswer, 18);\r

break;\r

};\r

memcpy(data, receivedAnswer, 18);\r

@@ -1473,9 +1550,9 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

// do no issue halt command for gen1b magic tag (#db# halt error. response len: 1)\r

if (!(workFlags & 0x40)) {\r

if (mifare_classic_halt(NULL, cuid)) {\r

// do no issue halt command for gen1b magic tag (#db# halt error. response len: 1)\r

if (!(workFlags & 0x40)) {\r

if (mifare_classic_halt(NULL, cuid)) {\r

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

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

// Continue, some magic tags misbehavies and send an answer to it.\r

- // break;\r

+ // break;\r

}\r

@@ -1510,36 +1587,34 @@ void MifareCIdent(){

uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

uint8_t receivedAnswerPar[MAX_MIFARE_PARITY_SIZE];\r

- \r

+\r

LED_A_ON();\r

LED_B_OFF();\r

LED_C_OFF();\r

LED_A_ON();\r

LED_B_OFF();\r

LED_C_OFF();\r

-// FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

-// SpinDelay(100);\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

clear_trace();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

clear_trace();\r

- set_tracing(true); \r

+ set_tracing(true);\r

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

- if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == 0x0a)) {\r

+ if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == CARD_ACK)) {\r

isOK = 2;\r

ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r

isOK = 2;\r

ReaderTransmit(wupC2, sizeof(wupC2), NULL);\r

- if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == 0x0a)) {\r

+ if(ReaderReceive(receivedAnswer, receivedAnswerPar) && (receivedAnswer[0] == CARD_ACK)) {\r

isOK = 1;\r

};\r

// From iceman1001: removed the if, since some magic tags misbehavies and send an answer to it.\r

mifare_classic_halt(NULL, 0);\r

isOK = 1;\r

};\r

// From iceman1001: removed the if, since some magic tags misbehavies and send an answer to it.\r

mifare_classic_halt(NULL, 0);\r

- \r

+\r

LED_B_ON();\r

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

LED_B_OFF();\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LED_B_ON();\r

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

LED_B_OFF();\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff(); \r

+ LEDsoff();\r

}\r

//\r

}\r

//\r

@@ -1569,7 +1644,7 @@ void Mifare_DES_Auth1(uint8_t arg0, uint8_t *datain){

}\r

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

}\r

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

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

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

}\r

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

}\r

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

@@ -1596,17 +1671,3 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){

LEDsoff();\r

}\r

LEDsoff();\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