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

index a3f0d374430ce9c9c7786f3853b76c7f017b5441..15db8f1181363ec81c759f5c332b688ae5b058d2 100644 (file)

--- a/armsrc/mifarecmd.c

+++ b/armsrc/mifarecmd.c

@@ -15,33 +15,60 @@

#include "mifarecmd.h"\r

+#include <stdint.h>\r

+\r

+#include "proxmark3.h"\r

+#include "usb_cdc.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 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

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

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

@@ -54,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

break;\r

};\r

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

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

+ if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, NULL)) {\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

@@ -86,33 +109,31 @@ 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

+\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LED_B_ON();\r

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

LED_B_OFF();\r

LED_B_ON();\r

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

LED_B_OFF();\r

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LEDsoff();\r

}\r

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

LEDsoff();\r

}\r

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

@@ -120,9 +141,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

@@ -130,17 +153,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

@@ -149,7 +170,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

@@ -160,7 +181,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

@@ -170,21 +191,23 @@ 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

}\r

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

OnError(3);\r

return;\r

}\r

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

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

+ LED_D_OFF();\r

+\r

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

+ LED_A_OFF();\r

}\r

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

}\r

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

@@ -219,25 +242,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

+ if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST, NULL)) {\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

@@ -245,12 +268,13 @@ void MifareReadSector(uint8_t arg0, uint8_t arg1, uint8_t arg2, uint8_t *datain)

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

+ // Thats it...\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+\r

LED_B_ON();\r

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

LED_B_OFF();\r

LED_B_ON();\r

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

LED_B_OFF();\r

- // Thats it...\r

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LEDsoff();\r

}\r

LEDsoff();\r

}\r

@@ -260,13 +284,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

@@ -289,7 +311,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

@@ -341,14 +363,15 @@ 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

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

+\r

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

+\r

BigBuf_free();\r

+ LED_A_OFF();\r

}\r

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

}\r

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

@@ -384,22 +407,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

break;\r

};\r

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

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

+ if(mifare_classic_auth(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, NULL)) {\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

@@ -410,15 +433,16 @@ 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

+\r

+ // Thats it...\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

LED_B_ON();\r

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

LED_B_OFF();\r

- // Thats it...\r

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

LEDsoff();\r

}\r

LEDsoff();\r

}\r

@@ -446,7 +470,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

@@ -456,8 +480,9 @@ void MifareUWriteBlockCompat(uint8_t arg0, uint8_t *datain)

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

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

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+\r

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

LEDsoff();\r

}\r

*/\r

LEDsoff();\r

}\r

*/\r

@@ -525,8 +550,9 @@ void MifareUWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain)

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

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

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+\r

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

LEDsoff();\r

}\r

LEDsoff();\r

}\r

@@ -594,8 +620,9 @@ void MifareUSetPwd(uint8_t arg0, uint8_t *datain){

return;\r

};\r

return;\r

};\r

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

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+\r

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

LEDsoff();\r

}\r

LEDsoff();\r

}\r

@@ -613,8 +640,7 @@ int valid_nonce(uint32_t Nt, uint32_t NtEnc, uint32_t Ks1, uint8_t *parity) {

// Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on\r

// Computer and Communications Security, 2015\r

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

// Mifare Classic Cards" in Proceedings of the 22nd ACM SIGSAC Conference on\r

// Computer and Communications Security, 2015\r

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

-void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain)\r

-{\r

+void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {\r

uint64_t ui64Key = 0;\r

uint8_t uid[10];\r

uint32_t cuid;\r

uint64_t ui64Key = 0;\r

uint8_t uid[10];\r

uint32_t cuid;\r

@@ -639,7 +665,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,

bool field_off = flags & 0x0004;\r

LED_A_ON();\r

bool field_off = flags & 0x0004;\r

LED_A_ON();\r

- LED_C_OFF();\r

if (initialize) {\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

if (initialize) {\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

@@ -647,8 +672,6 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,

set_tracing(true);\r

}\r

set_tracing(true);\r

}\r

- LED_C_ON();\r

-\r

uint16_t num_nonces = 0;\r

bool have_uid = false;\r

for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {\r

uint16_t num_nonces = 0;\r

bool have_uid = false;\r

for (uint16_t i = 0; i <= USB_CMD_DATA_SIZE - 9; ) {\r

@@ -663,7 +686,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

@@ -675,33 +698,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

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 (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, NULL, NULL)) {\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

@@ -719,20 +743,18 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,

}\r

- LED_C_OFF();\r

-\r

crypto1_destroy(pcs);\r

- LED_B_ON();\r

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

- LED_B_OFF();\r

-\r

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

-\r

if (field_off) {\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

if (field_off) {\r

FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

+ LED_D_OFF();\r

}\r

+\r

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

+\r

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

+\r

+ LED_A_OFF();\r

}\r

@@ -740,9 +762,8 @@ void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags,

// MIFARE nested authentication.\r

//\r

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

// MIFARE nested authentication.\r

//\r

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

-void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain)\r

-{\r

- // params\r

+void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *datain) {\r

+\r

uint8_t blockNo = arg0 & 0xff;\r

uint8_t keyType = (arg0 >> 8) & 0xff;\r

uint8_t targetBlockNo = arg1 & 0xff;\r

uint8_t blockNo = arg0 & 0xff;\r

uint8_t keyType = (arg0 >> 8) & 0xff;\r

uint8_t targetBlockNo = arg1 & 0xff;\r

@@ -751,14 +772,15 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

ui64Key = bytes_to_num(datain, 6);\r

- // variables\r

uint16_t rtr, i, j, len;\r

uint16_t davg;\r

static uint16_t dmin, dmax;\r

uint8_t uid[10];\r

uint16_t rtr, i, j, len;\r

uint16_t davg;\r

static uint16_t dmin, dmax;\r

uint8_t uid[10];\r

- uint32_t cuid, nt1, nt2, nttmp, nttest, ks1;\r

+ uint32_t cuid, nt1, nt2_enc, nttmp, nttest, ks1;\r

uint8_t par[1];\r

uint32_t target_nt[2], target_ks[2];\r

uint8_t par[1];\r

uint32_t target_nt[2], target_ks[2];\r

+ uint32_t fixed_nt = 0;\r

+ uint8_t target_nt_duplicate_count = 0;\r

uint8_t par_array[4];\r

uint16_t ncount = 0;\r

uint8_t par_array[4];\r

uint16_t ncount = 0;\r

@@ -767,11 +789,10 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

pcs = &mpcs;\r

uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

pcs = &mpcs;\r

uint8_t receivedAnswer[MAX_MIFARE_FRAME_SIZE];\r

- uint32_t auth1_time, auth2_time;\r

+ uint32_t auth1_time, auth2_time, authentication_timeout = 0;\r

static uint16_t delta_time;\r

LED_A_ON();\r

static uint16_t delta_time;\r

LED_A_ON();\r

- LED_C_OFF();\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

// free eventually allocated BigBuf memory\r

iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

// free eventually allocated BigBuf memory\r

@@ -784,8 +805,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

- LED_B_ON();\r

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

WDT_HIT();\r

davg = dmax = 0;\r

WDT_HIT();\r

davg = dmax = 0;\r

@@ -794,47 +814,48 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

for (rtr = 0; rtr < 17; rtr++) {\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

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

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

rtr--;\r

continue;\r

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

+ // Test if the action was cancelled\r

+ if (BUTTON_PRESS()) {\r

+ isOK = -2;\r

+ break;\r

+ }\r

+\r

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

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

rtr--;\r

continue;\r

};\r

auth1_time = 0;\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 (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_FIRST, &nt1, &auth1_time, NULL)) {\r

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

rtr--;\r

continue;\r

};\r

rtr--;\r

continue;\r

};\r

+ fixed_nt = nt1;\r

if (delta_time) {\r

auth2_time = auth1_time + delta_time;\r

} else {\r

auth2_time = 0;\r

}\r

if (delta_time) {\r

auth2_time = auth1_time + delta_time;\r

} else {\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 (mifare_classic_authex(pcs, cuid, blockNo, keyType, ui64Key, AUTH_NESTED, &nt2_enc, &auth2_time, NULL)) {\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

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

nttmp = prng_successor(nttmp, 1);\r

- if (nttmp == nt2) break;\r

+ if (nttmp == nt2_enc) break;\r

}\r

if (i != 1200) {\r

}\r

if (i != 1200) {\r

@@ -849,7 +870,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

@@ -862,46 +883,49 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

dmin = davg - 2;\r

dmax = davg + 2;\r

dmin = davg - 2;\r

dmax = davg + 2;\r

- LED_B_OFF();\r

-\r

}\r

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

}\r

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

- LED_C_ON();\r

-\r

// get crypted nonces for target sector\r

- for(i=0; i < 2 && !isOK; i++) { // look for exactly two different nonces\r

+ for (i = 0; i < 2 && !isOK; i++) { // look for exactly two different nonces\r

target_nt[i] = 0;\r

- while(target_nt[i] == 0) { // continue until we have an unambiguous nonce\r

+ while (target_nt[i] == 0 && !isOK) { // continue until we have an unambiguous nonce\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 (mifare_classic_halt(pcs, cuid)) {\r

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

continue;\r

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

+ // break out of the loop on button press\r

+ if (BUTTON_PRESS()) {\r

+ isOK = -2;\r

+ break;\r

+ }\r

+\r

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

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

continue;\r

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

+ authentication_timeout = 0;\r

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

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

continue;\r

- };\r

+ }\r

// nested authentication\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

// nested authentication\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

+ }\r

- nt2 = bytes_to_num(receivedAnswer, 4);\r

- if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2, par[0]);\r

+ nt2_enc = bytes_to_num(receivedAnswer, 4);\r

+ if (MF_DBGLEVEL >= 3) Dbprintf("Nonce#%d: Testing nt1=%08x nt2enc=%08x nt2par=%02x", i+1, nt1, nt2_enc, par[0]);\r

// Parity validity check\r

for (j = 0; j < 4; j++) {\r

// Parity validity check\r

for (j = 0; j < 4; j++) {\r

@@ -912,10 +936,10 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

nttest = prng_successor(nt1, dmin - 1);\r

for (j = dmin; j < dmax + 1; j++) {\r

nttest = prng_successor(nttest, 1);\r

nttest = prng_successor(nt1, dmin - 1);\r

for (j = dmin; j < dmax + 1; j++) {\r

nttest = prng_successor(nttest, 1);\r

- ks1 = nt2 ^ nttest;\r

+ ks1 = nt2_enc ^ 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 (valid_nonce(nttest, nt2_enc, ks1, par_array)){\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

@@ -924,7 +948,12 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

target_ks[i] = ks1;\r

ncount++;\r

if (i == 1 && target_nt[1] == target_nt[0]) { // we need two different nonces\r

target_ks[i] = ks1;\r

ncount++;\r

if (i == 1 && target_nt[1] == target_nt[0]) { // we need two different nonces\r

- target_nt[i] = 0;\r

+ if( ++target_nt_duplicate_count >= NESTED_MAX_TRIES ) { // unable to get a 2nd nonce after NESTED_MAX_TRIES tries, probably a fixed nonce\r

+ if (MF_DBGLEVEL >= 2) Dbprintf("Nonce#2: cannot get nonce that != nonce#1, continuing anyway with single nonce! ntdist=%d", j);\r

+ break;\r

+ }\r

+\r

+ target_nt[1] = 0;\r

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

break;\r

}\r

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

break;\r

}\r

@@ -935,115 +964,148 @@ void MifareNested(uint32_t arg0, uint32_t arg1, uint32_t calibrate, uint8_t *dat

}\r

- LED_C_OFF();\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ LED_D_OFF();\r

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

crypto1_destroy(pcs);\r

- byte_t buf[4 + 4 * 4];\r

+ uint8_t buf[4 + 4 * 4 + 4 + 4];\r

memcpy(buf, &cuid, 4);\r

memcpy(buf+4, &target_nt[0], 4);\r

memcpy(buf+8, &target_ks[0], 4);\r

memcpy(buf+12, &target_nt[1], 4);\r

memcpy(buf+16, &target_ks[1], 4);\r

memcpy(buf, &cuid, 4);\r

memcpy(buf+4, &target_nt[0], 4);\r

memcpy(buf+8, &target_ks[0], 4);\r

memcpy(buf+12, &target_nt[1], 4);\r

memcpy(buf+16, &target_ks[1], 4);\r

+ memcpy(buf+20, &authentication_timeout, 4);\r

+ memcpy(buf+24, &fixed_nt, 4);\r

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

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

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

+ LED_A_OFF();\r

}\r

+\r

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

// MIFARE check keys. key count up to 85.\r

//\r

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

// MIFARE check keys. key count up to 85.\r

//\r

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

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

-{\r

+void MifareChkKeys(uint16_t arg0, uint32_t arg1, uint8_t arg2, uint8_t *datain) {\r

+\r

uint8_t blockNo = arg0 & 0xff;\r

- uint8_t keyType = (arg0 >> 8) & 0xff;\r

- bool clearTrace = arg1;\r

+ uint8_t keyType = arg0 >> 8;\r

+ bool clearTrace = arg1 & 0x01;\r

+ bool multisectorCheck = arg1 & 0x02;\r

+ bool init = arg1 & 0x04;\r

+ bool drop_field = arg1 & 0x08;\r

+ bool fixed_nonce = arg1 & 0x10;\r

+ uint32_t auth_timeout = arg1 >> 16;\r

uint8_t keyCount = arg2;\r

- uint64_t ui64Key = 0;\r

- bool have_uid = false;\r

- uint8_t cascade_levels = 0;\r

- uint32_t timeout = 0;\r

- int i;\r

- byte_t isOK = 0;\r

+ LED_A_ON();\r

+\r

+ if (init) {\r

+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

+ }\r

+ \r

+ if (clearTrace) {\r

+ clear_trace();\r

+ }\r

+ set_tracing(true);\r

+\r

+ // clear debug level. We are expecting lots of authentication failures...\r

+ int OLD_MF_DBGLEVEL = MF_DBGLEVEL;\r

+ MF_DBGLEVEL = MF_DBG_NONE;\r

+\r

+ int res = 0;\r

+ if (multisectorCheck) {\r

+ TKeyIndex keyIndex = {{0}};\r

+ uint8_t sectorCnt = blockNo;\r

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

+ if (res >= 0) {\r

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

+ } else {\r

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

+ }\r

+ } else if (fixed_nonce) {\r

+ res = MifareChkBlockKeysFixedNonce(datain, keyCount, blockNo, keyType, &auth_timeout, OLD_MF_DBGLEVEL);\r

+ if (res > 0) {\r

+ cmd_send(CMD_ACK, 1, res, 0, NULL, 0); // key found\r

+ } else {\r

+ cmd_send(CMD_ACK, 0, res, 0, NULL, 0); // no key found or aborted\r

+ }\r

+ } else {\r

+ res = MifareChkBlockKeys(datain, keyCount, blockNo, keyType, &auth_timeout, OLD_MF_DBGLEVEL);\r

+ if (res > 0) {\r

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

+ } else {\r

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

+ }\r

+\r

+ if (drop_field || res != 0) {\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ LED_D_OFF();\r

+ }\r

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

uint8_t uid[10];\r

uint32_t cuid;\r

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

struct Crypto1State *pcs;\r

pcs = &mpcs;\r

- // clear debug level\r

- int OLD_MF_DBGLEVEL = MF_DBGLEVEL;\r

- MF_DBGLEVEL = MF_DBG_NONE;\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

+ clear_trace();\r

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

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

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

-// }\r

+ iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);\r

- // Iceman: use piwi's faster nonce collecting part in hardnested.\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 (OLD_MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card");\r

- --i; // try same key once again\r

- continue;\r

- }\r

- switch (card_info.uidlen) {\r

- case 4 : cascade_levels = 1; break;\r

- case 7 : cascade_levels = 2; break;\r

- case 10: cascade_levels = 3; break;\r

- default: break;\r

- }\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 (OLD_MF_DBGLEVEL >= 1) Dbprintf("ChkKeys: Can't select card (UID)");\r

- --i; // try same key once again\r

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

- ui64Key = bytes_to_num(datain + i * 6, 6);\r

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

- uint8_t dummy_answer = 0;\r

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

- timeout = GetCountSspClk() + AUTHENTICATION_TIMEOUT;\r

-\r

- // wait for the card to become ready again\r

- while(GetCountSspClk() < timeout);\r

- continue;\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, NULL)) {\r

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

+ break;\r

}\r

- isOK = 1;\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

break;\r

}\r

- LED_B_ON();\r

- cmd_send(CMD_ACK,isOK,0,0,datain + i * 6,6);\r

- LED_B_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

+ 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

@@ -1113,21 +1175,21 @@ 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

ui64Key = emlGetKey(sectorNo, keyType);\r

if (sectorNo == 0){\r

}\r

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

ui64Key = emlGetKey(sectorNo, keyType);\r

if (sectorNo == 0){\r

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

+ if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_FIRST, NULL)) {\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

break;\r

}\r

} else {\r

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

+ if(isOK && mifare_classic_auth(pcs, cuid, FirstBlockOfSector(sectorNo), keyType, ui64Key, AUTH_NESTED, NULL)) {\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

@@ -1135,13 +1197,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

@@ -1152,7 +1214,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

@@ -1178,7 +1240,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

@@ -1193,20 +1255,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

@@ -1216,54 +1278,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

@@ -1277,33 +1339,34 @@ 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

+\r

+ // reset fpga\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\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

- // reset fpga\r

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+\r

LEDsoff();\r

- \r

+\r

return;\r

}\r

return;\r

}\r

@@ -1350,13 +1413,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

@@ -1366,21 +1429,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

@@ -1388,24 +1451,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

@@ -1413,8 +1476,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

@@ -1422,7 +1485,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

@@ -1433,14 +1496,15 @@ void MifareCSetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

break;\r

}\r

break;\r

}\r

+ if ((workFlags & 0x10) || (!isOK)) {\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ }\r

+\r

LED_B_ON();\r

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

LED_B_OFF();\r

LED_B_ON();\r

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

LED_B_OFF();\r

- if ((workFlags & 0x10) || (!isOK)) {\r

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

- }\r

+ LEDsoff();\r

}\r

@@ -1481,15 +1545,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

@@ -1497,7 +1561,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

@@ -1506,9 +1570,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

@@ -1517,6 +1581,10 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

break;\r

}\r

break;\r

}\r

+ if ((workFlags & 0x10) || (!isOK)) {\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+ }\r

+\r

LED_B_ON();\r

if (workFlags & 0x20) {\r

if (isOK)\r

LED_B_ON();\r

if (workFlags & 0x20) {\r

if (isOK)\r

@@ -1526,10 +1594,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datai

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

LED_B_OFF();\r

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

LED_B_OFF();\r

- if ((workFlags & 0x10) || (!isOK)) {\r

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

- LEDsoff();\r

- }\r

+ LEDsoff();\r

}\r

void MifareCIdent(){\r

}\r

void MifareCIdent(){\r

@@ -1544,12 +1609,20 @@ 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

+ 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

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

isOK = 1;\r

};\r

@@ -1557,7 +1630,13 @@ void MifareCIdent(){

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

mifare_classic_halt(NULL, 0);\r

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

mifare_classic_halt(NULL, 0);\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+\r

+ LED_B_ON();\r

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

+ LED_B_OFF();\r

+\r

+ LEDsoff();\r

}\r

//\r

}\r

//\r

@@ -1587,7 +1666,8 @@ 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

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

@@ -1601,30 +1681,17 @@ void Mifare_DES_Auth2(uint32_t arg0, uint8_t *datain){

isOK = mifare_desfire_des_auth2(cuid, key, dataout);\r

- if( isOK) {\r

+ if (isOK) {\r

if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");\r

OnError(4);\r

return;\r

}\r

if (MF_DBGLEVEL >= MF_DBG_EXTENDED) Dbprintf("Authentication part2: Failed");\r

OnError(4);\r

return;\r

}\r

+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

+\r

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

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

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

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

- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);\r

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