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

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

\r

#include "cmdhfmf.h"\r

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

\r

#include "cmdhfmf.h"\r

-#include "proxmark3.h"\r

\r

static int CmdHelp(const char *Cmd);\r

\r

int CmdHF14AMifare(const char *Cmd)\r

{\r

uint32_t uid = 0;\r

\r

static int CmdHelp(const char *Cmd);\r

\r

int CmdHF14AMifare(const char *Cmd)\r

{\r

uint32_t uid = 0;\r

- uint32_t nt = 0;\r

+ uint32_t nt = 0, nr = 0;\r

uint64_t par_list = 0, ks_list = 0, r_key = 0;\r

- uint8_t isOK = 0;\r

- uint8_t keyBlock[8] = {0};\r

+ int16_t isOK = 0;\r

\r

- if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, keyBlock, 8)) {\r

- PrintAndLog("Nt must include 8 HEX symbols");\r

- return 1;\r

- }\r

+ UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}};\r

+\r

+ // message\r

+ printf("-------------------------------------------------------------------------\n");\r

+ printf("Executing command. Expected execution time: 25sec on average :-)\n");\r

+ printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n");\r

+ printf("-------------------------------------------------------------------------\n");\r

\r

- UsbCommand c = {CMD_READER_MIFARE, {(uint32_t)bytes_to_num(keyBlock, 4), 0, 0}};\r

start:\r

- SendCommand(&c);\r

+ clearCommandBuffer();\r

+ SendCommand(&c);\r

\r

//flush queue\r

while (ukbhit()) getchar();\r

\r

//flush queue\r

while (ukbhit()) getchar();\r

\r

- // message\r

- printf("-------------------------------------------------------------------------\n");\r

- printf("Executing command. It may take up to 30 min.\n");\r

- printf("Press the key on proxmark3 device to abort proxmark3.\n");\r

- printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r

- printf("-------------------------------------------------------------------------\n");\r

- \r

// wait cycle\r

while (true) {\r

// wait cycle\r

while (true) {\r

- printf(".");\r

+ printf(".");\r

fflush(stdout);\r

if (ukbhit()) {\r

getchar();\r

fflush(stdout);\r

if (ukbhit()) {\r

getchar();\r

break;\r

}\r

\r

break;\r

}\r

\r

- UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 2000);\r

- if (resp != NULL) {\r

- isOK = resp->arg[0] & 0xff;\r

- \r

- uid = (uint32_t)bytes_to_num(resp->d.asBytes + 0, 4);\r

- nt = (uint32_t)bytes_to_num(resp->d.asBytes + 4, 4);\r

- par_list = bytes_to_num(resp->d.asBytes + 8, 8);\r

- ks_list = bytes_to_num(resp->d.asBytes + 16, 8);\r

- \r

+ UsbCommand resp;\r

+ if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {\r

+ isOK = resp.arg[0];\r

+ uid = (uint32_t)bytes_to_num(resp.d.asBytes + 0, 4);\r

+ nt = (uint32_t)bytes_to_num(resp.d.asBytes + 4, 4);\r

+ par_list = bytes_to_num(resp.d.asBytes + 8, 8);\r

+ ks_list = bytes_to_num(resp.d.asBytes + 16, 8);\r

+ nr = bytes_to_num(resp.d.asBytes + 24, 4);\r

printf("\n\n");\r

- PrintAndLog("isOk:%02x", isOK);\r

- if (!isOK) PrintAndLog("Proxmark can't get statistic info. Execution aborted.\n");\r

+ switch (isOK) {\r

+ case -1 : PrintAndLog("Button pressed. Aborted.\n"); break;\r

+ case -2 : PrintAndLog("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).\n"); break;\r

+ case -3 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator is not predictable).\n"); break;\r

+ case -4 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown");\r

+ PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break;\r

+ default: ;\r

+ }\r

break;\r

}\r

} \r

break;\r

}\r

} \r

+\r

printf("\n");\r

\r

// error\r

if (isOK != 1) return 1;\r

\r

// execute original function from util nonce2key\r

printf("\n");\r

\r

// error\r

if (isOK != 1) return 1;\r

\r

// execute original function from util nonce2key\r

- if (nonce2key(uid, nt, par_list, ks_list, &r_key)) return 2;\r

- printf("------------------------------------------------------------------\n");\r

- PrintAndLog("Key found:%012llx \n", r_key);\r

-\r

- num_to_bytes(r_key, 6, keyBlock);\r

- isOK = mfCheckKeys(0, 0, 1, keyBlock, &r_key);\r

- if (!isOK) \r

- PrintAndLog("Found valid key:%012llx", r_key);\r

- else\r

- {\r

- PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt); \r

- c.arg[0] = nt;\r

+ if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) {\r

+ isOK = 2;\r

+ PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt); \r

+ PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce...");\r

+ c.arg[0] = false;\r

goto start;\r

+ } else {\r

+ isOK = 0;\r

+ printf("------------------------------------------------------------------\n");\r

+ PrintAndLog("Found valid key:%012"llx" \n", r_key);\r

}\r

\r

}\r

\r

+ PrintAndLog("");\r

return 0;\r

}\r

\r

return 0;\r

}\r

\r

PrintAndLog("Block data must include 32 HEX symbols");\r

return 1;\r

}\r

PrintAndLog("Block data must include 32 HEX symbols");\r

return 1;\r

}\r

- PrintAndLog("--block no:%02x key type:%02x key:%s", blockNo, keyType, sprint_hex(key, 6));\r

+ PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r

PrintAndLog("--data: %s", sprint_hex(bldata, 16));\r

\r

UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};\r

memcpy(c.d.asBytes, key, 6);\r

memcpy(c.d.asBytes + 10, bldata, 16);\r

SendCommand(&c);\r

PrintAndLog("--data: %s", sprint_hex(bldata, 16));\r

\r

UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}};\r

memcpy(c.d.asBytes, key, 6);\r

memcpy(c.d.asBytes + 10, bldata, 16);\r

SendCommand(&c);\r

- UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r

-\r

- if (resp != NULL) {\r

- uint8_t isOK = resp->arg[0] & 0xff;\r

\r

+ UsbCommand resp;\r

+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r

+ uint8_t isOK = resp.arg[0] & 0xff;\r

PrintAndLog("isOk:%02x", isOK);\r

} else {\r

PrintAndLog("Command execute timeout");\r

PrintAndLog("isOk:%02x", isOK);\r

} else {\r

PrintAndLog("Command execute timeout");\r

PrintAndLog("Key must include 12 HEX symbols");\r

return 1;\r

}\r

PrintAndLog("Key must include 12 HEX symbols");\r

return 1;\r

}\r

- PrintAndLog("--block no:%02x key type:%02x key:%s ", blockNo, keyType, sprint_hex(key, 6));\r

+ PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r

\r

UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r

memcpy(c.d.asBytes, key, 6);\r

SendCommand(&c);\r

\r

UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r

memcpy(c.d.asBytes, key, 6);\r

SendCommand(&c);\r

- UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r

\r

- if (resp != NULL) {\r

- uint8_t isOK = resp->arg[0] & 0xff;\r

- uint8_t * data = resp->d.asBytes;\r

+ UsbCommand resp;\r

+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r

+ uint8_t isOK = resp.arg[0] & 0xff;\r

+ uint8_t *data = resp.d.asBytes;\r

\r

if (isOK)\r

PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 16));\r

\r

if (isOK)\r

PrintAndLog("isOk:%02x data:%s", isOK, sprint_hex(data, 16));\r

uint8_t sectorNo = 0;\r

uint8_t keyType = 0;\r

uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r

uint8_t sectorNo = 0;\r

uint8_t keyType = 0;\r

uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r

- \r

uint8_t isOK = 0;\r

- uint8_t * data = NULL;\r

-\r

+ uint8_t *data = NULL;\r

char cmdp = 0x00;\r

\r

if (strlen(Cmd)<3) {\r

char cmdp = 0x00;\r

\r

if (strlen(Cmd)<3) {\r

} \r

\r

sectorNo = param_get8(Cmd, 0);\r

} \r

\r

sectorNo = param_get8(Cmd, 0);\r

- if (sectorNo > 63) {\r

- PrintAndLog("Sector number must be less than 64");\r

+ if (sectorNo > 39) {\r

+ PrintAndLog("Sector number must be less than 40");\r

return 1;\r

}\r

cmdp = param_getchar(Cmd, 1);\r

return 1;\r

}\r

cmdp = param_getchar(Cmd, 1);\r

- if (cmdp == 0x00) {\r

+ if (cmdp != 'a' && cmdp != 'A' && cmdp != 'b' && cmdp != 'B') {\r

PrintAndLog("Key type must be A or B");\r

return 1;\r

}\r

PrintAndLog("Key type must be A or B");\r

return 1;\r

}\r

PrintAndLog("Key must include 12 HEX symbols");\r

return 1;\r

}\r

PrintAndLog("Key must include 12 HEX symbols");\r

return 1;\r

}\r

- PrintAndLog("--sector no:%02x key type:%02x key:%s ", sectorNo, keyType, sprint_hex(key, 6));\r

+ PrintAndLog("--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));\r

\r

- UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r

+ UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r

memcpy(c.d.asBytes, key, 6);\r

- SendCommand(&c);\r

- UsbCommand * resp = WaitForResponseTimeout(CMD_ACK, 1500);\r

+ SendCommand(&c);\r

PrintAndLog(" ");\r

\r

PrintAndLog(" ");\r

\r

- if (resp != NULL) {\r

- isOK = resp->arg[0] & 0xff;\r

- data = resp->d.asBytes;\r

+ UsbCommand resp;\r

+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r

+ isOK = resp.arg[0] & 0xff;\r

+ data = resp.d.asBytes;\r

\r

PrintAndLog("isOk:%02x", isOK);\r

\r

PrintAndLog("isOk:%02x", isOK);\r

- if (isOK) \r

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

- PrintAndLog("data:%s", sprint_hex(data + i * 16, 16));\r

+ if (isOK) {\r

+ for (i = 0; i < (sectorNo<32?3:15); i++) {\r

+ PrintAndLog("data : %s", sprint_hex(data + i * 16, 16));\r

}\r

+ PrintAndLog("trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));\r

+ }\r

} else {\r

- PrintAndLog("Command1 execute timeout");\r

+ PrintAndLog("Command execute timeout");\r

}\r

\r

}\r

\r

- // response2\r

- resp = WaitForResponseTimeout(CMD_ACK, 500);\r

- PrintAndLog(" ");\r

+ return 0;\r

+}\r

\r

- if (resp != NULL) {\r

- isOK = resp->arg[0] & 0xff;\r

- data = resp->d.asBytes;\r

+uint8_t FirstBlockOfSector(uint8_t sectorNo)\r

+{\r

+ if (sectorNo < 32) {\r

+ return sectorNo * 4;\r

+ } else {\r

+ return 32 * 4 + (sectorNo - 32) * 16;\r

+ }\r

+}\r

\r

- if (isOK) \r

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

- PrintAndLog("data:%s", sprint_hex(data + i * 16, 16));\r

- }\r

+uint8_t NumBlocksPerSector(uint8_t sectorNo)\r

+{\r

+ if (sectorNo < 32) {\r

+ return 4;\r

} else {\r

- PrintAndLog("Command2 execute timeout");\r

+ return 16;\r

}\r

- \r

- return 0;\r

}\r

\r

int CmdHF14AMfDump(const char *Cmd)\r

{\r

}\r

\r

int CmdHF14AMfDump(const char *Cmd)\r

{\r

- int i, j;\r

+ uint8_t sectorNo, blockNo;\r

\r

uint8_t keyA[40][6];\r

uint8_t keyB[40][6];\r

uint8_t rights[40][4];\r

\r

uint8_t keyA[40][6];\r

uint8_t keyB[40][6];\r

uint8_t rights[40][4];\r

+ uint8_t carddata[256][16];\r

+ uint8_t numSectors = 16;\r

\r

FILE *fin;\r

FILE *fout;\r

\r

FILE *fin;\r

FILE *fout;\r

\r

- UsbCommand *resp;\r

+ UsbCommand resp;\r

+\r

+ char cmdp = param_getchar(Cmd, 0);\r

+ switch (cmdp) {\r

+ case '0' : numSectors = 5; break;\r

+ case '1' : \r

+ case '\0': numSectors = 16; break;\r

+ case '2' : numSectors = 32; break;\r

+ case '4' : numSectors = 40; break;\r

+ default: numSectors = 16;\r

+ } \r

+ \r

+ if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r

+ PrintAndLog("Usage: hf mf dump [card memory]");\r

+ PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r

+ PrintAndLog("");\r

+ PrintAndLog("Samples: hf mf dump");\r

+ PrintAndLog(" hf mf dump 4");\r

+ return 0;\r

+ }\r

\r

if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r

PrintAndLog("Could not find file dumpkeys.bin");\r

return 1;\r

}\r

\r

if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r

PrintAndLog("Could not find file dumpkeys.bin");\r

return 1;\r

}\r

\r

- if ((fout = fopen("dumpdata.bin","wb")) == NULL) { \r

- PrintAndLog("Could not create file name dumpdata.bin");\r

- return 1;\r

+ // Read keys A from file\r

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

+ if (fread( keyA[sectorNo], 1, 6, fin ) == 0) {\r

+ PrintAndLog("File reading error.");\r

+ fclose(fin);\r

+ return 2;\r

+ }\r

}\r

\r

}\r

\r

- // Read key file\r

- \r

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

- fread ( keyA[i], 1, 6, fin );\r

- }\r

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

- fread ( keyB[i], 1, 6, fin );\r

+ // Read keys B from file\r

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

+ if (fread( keyB[sectorNo], 1, 6, fin ) == 0) {\r

+ PrintAndLog("File reading error.");\r

+ fclose(fin);\r

+ return 2;\r

+ }\r

}\r

\r

}\r

\r

- // Read access rights to sectors\r

- \r

+ fclose(fin);\r

+\r

PrintAndLog("|-----------------------------------------|");\r

PrintAndLog("|------ Reading sector access bits...-----|");\r

PrintAndLog("|-----------------------------------------|");\r

\r

PrintAndLog("|-----------------------------------------|");\r

PrintAndLog("|------ Reading sector access bits...-----|");\r

PrintAndLog("|-----------------------------------------|");\r

\r

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

- UsbCommand c = {CMD_MIFARE_READBL, {4*i + 3, 0, 0}};\r

- memcpy(c.d.asBytes, keyA[i], 6);\r

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

+ UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 0, 0}};\r

+ memcpy(c.d.asBytes, keyA[sectorNo], 6);\r

SendCommand(&c);\r

- resp = WaitForResponseTimeout(CMD_ACK, 1500);\r

\r

- if (resp != NULL) {\r

- uint8_t isOK = resp->arg[0] & 0xff;\r

- uint8_t *data = resp->d.asBytes;\r

+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r

+ uint8_t isOK = resp.arg[0] & 0xff;\r

+ uint8_t *data = resp.d.asBytes;\r

if (isOK){\r

- rights[i][0] = ((data[7] & 0x10)>>4) | ((data[8] & 0x1)<<1) | ((data[8] & 0x10)>>2);\r

- rights[i][1] = ((data[7] & 0x20)>>5) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>3);\r

- rights[i][2] = ((data[7] & 0x40)>>6) | ((data[8] & 0x4)>>1) | ((data[8] & 0x40)>>4);\r

- rights[i][3] = ((data[7] & 0x80)>>7) | ((data[8] & 0x8)>>2) | ((data[8] & 0x80)>>5);\r

- }\r

- else{\r

- PrintAndLog("Could not get access rights for block %d", i);\r

+ rights[sectorNo][0] = ((data[7] & 0x10)>>2) | ((data[8] & 0x1)<<1) | ((data[8] & 0x10)>>4); // C1C2C3 for data area 0\r

+ rights[sectorNo][1] = ((data[7] & 0x20)>>3) | ((data[8] & 0x2)<<0) | ((data[8] & 0x20)>>5); // C1C2C3 for data area 1\r

+ rights[sectorNo][2] = ((data[7] & 0x40)>>4) | ((data[8] & 0x4)>>1) | ((data[8] & 0x40)>>6); // C1C2C3 for data area 2\r

+ rights[sectorNo][3] = ((data[7] & 0x80)>>5) | ((data[8] & 0x8)>>2) | ((data[8] & 0x80)>>7); // C1C2C3 for sector trailer\r

+ } else {\r

+ PrintAndLog("Could not get access rights for sector %2d. Trying with defaults...", sectorNo);\r

+ rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;\r

+ rights[sectorNo][3] = 0x01;\r

}\r

- }\r

- else {\r

- PrintAndLog("Command execute timeout");\r

+ } else {\r

+ PrintAndLog("Command execute timeout when trying to read access rights for sector %2d. Trying with defaults...", sectorNo);\r

+ rights[sectorNo][0] = rights[sectorNo][1] = rights[sectorNo][2] = 0x00;\r

+ rights[sectorNo][3] = 0x01;\r

}\r

\r

}\r

\r

- // Read blocks and print to file\r

- \r

PrintAndLog("|-----------------------------------------|");\r

PrintAndLog("|----- Dumping all blocks to file... -----|");\r

PrintAndLog("|-----------------------------------------|");\r

\r

PrintAndLog("|-----------------------------------------|");\r

PrintAndLog("|----- Dumping all blocks to file... -----|");\r

PrintAndLog("|-----------------------------------------|");\r

\r

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

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

- if (j == 3){\r

- UsbCommand c = {CMD_MIFARE_READBL, {i*4 + j, 0, 0}};\r

- memcpy(c.d.asBytes, keyA[i], 6);\r

+ bool isOK = true;\r

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

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

+ bool received = false;\r

+ \r

+ if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A. \r

+ UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r

+ memcpy(c.d.asBytes, keyA[sectorNo], 6);\r

SendCommand(&c);\r

- resp = WaitForResponseTimeout(CMD_ACK, 1500);\r

- }\r

- else{\r

- if ((rights[i][j] == 6) | (rights[i][j] == 5)) {\r

- UsbCommand c = {CMD_MIFARE_READBL, {i*4+j, 1, 0}};\r

- memcpy(c.d.asBytes, keyB[i], 6);\r

+ received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r

+ } else { // data block. Check if it can be read with key A or key B\r

+ uint8_t data_area = sectorNo<32?blockNo:blockNo/5;\r

+ if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work\r

+ UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};\r

+ memcpy(c.d.asBytes, keyB[sectorNo], 6);\r

SendCommand(&c);\r

- resp = WaitForResponseTimeout(CMD_ACK, 1500);\r

- }\r

- else if (rights[i][j] == 7) {\r

- PrintAndLog("Access rights do not allow reading of sector %d block %d",i,j);\r

- }\r

- else {\r

- UsbCommand c = {CMD_MIFARE_READBL, {i*4+j, 0, 0}};\r

- memcpy(c.d.asBytes, keyA[i], 6);\r

+ received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r

+ } else if (rights[sectorNo][data_area] == 0x07) { // no key would work\r

+ isOK = false;\r

+ PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);\r

+ } else { // key A would work\r

+ UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};\r

+ memcpy(c.d.asBytes, keyA[sectorNo], 6);\r

SendCommand(&c);\r

- resp = WaitForResponseTimeout(CMD_ACK, 1500);\r

+ received = WaitForResponseTimeout(CMD_ACK,&resp,1500);\r

}\r

\r

}\r

\r

- if (resp != NULL) {\r

- uint8_t isOK = resp->arg[0] & 0xff;\r

- uint8_t *data = resp->d.asBytes;\r

- if (j == 3) {\r

- data[0] = (keyA[i][0]);\r

- data[1] = (keyA[i][1]);\r

- data[2] = (keyA[i][2]);\r

- data[3] = (keyA[i][3]);\r

- data[4] = (keyA[i][4]);\r

- data[5] = (keyA[i][5]);\r

- data[10] = (keyB[i][0]);\r

- data[11] = (keyB[i][1]);\r

- data[12] = (keyB[i][2]);\r

- data[13] = (keyB[i][3]);\r

- data[14] = (keyB[i][4]);\r

- data[15] = (keyB[i][5]);\r

+ if (received) {\r

+ isOK = resp.arg[0] & 0xff;\r

+ uint8_t *data = resp.d.asBytes;\r

+ if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. Fill in the keys.\r

+ data[0] = (keyA[sectorNo][0]);\r

+ data[1] = (keyA[sectorNo][1]);\r

+ data[2] = (keyA[sectorNo][2]);\r

+ data[3] = (keyA[sectorNo][3]);\r

+ data[4] = (keyA[sectorNo][4]);\r

+ data[5] = (keyA[sectorNo][5]);\r

+ data[10] = (keyB[sectorNo][0]);\r

+ data[11] = (keyB[sectorNo][1]);\r

+ data[12] = (keyB[sectorNo][2]);\r

+ data[13] = (keyB[sectorNo][3]);\r

+ data[14] = (keyB[sectorNo][4]);\r

+ data[15] = (keyB[sectorNo][5]);\r

}\r

if (isOK) {\r

}\r

if (isOK) {\r

- fwrite ( data, 1, 16, fout );\r

- }\r

- else {\r

- PrintAndLog("Could not get access rights for block %d", i);\r

+ memcpy(carddata[FirstBlockOfSector(sectorNo) + blockNo], data, 16);\r

+ PrintAndLog("Successfully read block %2d of sector %2d.", blockNo, sectorNo);\r

+ } else {\r

+ PrintAndLog("Could not read block %2d of sector %2d", blockNo, sectorNo);\r

+ break;\r

}\r

else {\r

}\r

else {\r

- PrintAndLog("Command execute timeout");\r

+ isOK = false;\r

+ PrintAndLog("Command execute timeout when trying to read block %2d of sector %2d.", blockNo, sectorNo);\r

+ break;\r

}\r

- \r

- fclose(fin);\r

- fclose(fout);\r

- \r

- return 0;\r

+\r

+ if (isOK) {\r

+ if ((fout = fopen("dumpdata.bin","wb")) == NULL) { \r

+ PrintAndLog("Could not create file name dumpdata.bin");\r

+ return 1;\r

+ }\r

+ uint16_t numblocks = FirstBlockOfSector(numSectors - 1) + NumBlocksPerSector(numSectors - 1);\r

+ fwrite(carddata, 1, 16*numblocks, fout);\r

+ fclose(fout);\r

+ PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);\r

+ }\r

+ \r

+ return 0;\r

}\r

\r

int CmdHF14AMfRestore(const char *Cmd)\r

{\r

}\r

\r

int CmdHF14AMfRestore(const char *Cmd)\r

{\r

-\r

- int i,j;\r

+ uint8_t sectorNo,blockNo;\r

uint8_t keyType = 0;\r

- uint8_t key[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r

- uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};\r

- uint8_t keyA[16][6];\r

- uint8_t keyB[16][6];\r

+ uint8_t key[6] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};\r

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

+ uint8_t keyA[40][6];\r

+ uint8_t keyB[40][6];\r

+ uint8_t numSectors;\r

\r

FILE *fdump;\r

FILE *fkeys;\r

\r

FILE *fdump;\r

FILE *fkeys;\r

- \r

- if ((fdump = fopen("dumpdata.bin","rb")) == NULL) {\r

- PrintAndLog("Could not find file dumpdata.bin");\r

- return 1;\r

+\r

+ char cmdp = param_getchar(Cmd, 0);\r

+ switch (cmdp) {\r

+ case '0' : numSectors = 5; break;\r

+ case '1' : \r

+ case '\0': numSectors = 16; break;\r

+ case '2' : numSectors = 32; break;\r

+ case '4' : numSectors = 40; break;\r

+ default: numSectors = 16;\r

+ } \r

+\r

+ if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r

+ PrintAndLog("Usage: hf mf restore [card memory]");\r

+ PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r

+ PrintAndLog("");\r

+ PrintAndLog("Samples: hf mf restore");\r

+ PrintAndLog(" hf mf restore 4");\r

+ return 0;\r

}\r

+\r

if ((fkeys = fopen("dumpkeys.bin","rb")) == NULL) {\r

PrintAndLog("Could not find file dumpkeys.bin");\r

return 1;\r

}\r

\r

if ((fkeys = fopen("dumpkeys.bin","rb")) == NULL) {\r

PrintAndLog("Could not find file dumpkeys.bin");\r

return 1;\r

}\r

\r

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

- fread(keyA[i], 1, 6, fkeys);\r

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

+ if (fread(keyA[sectorNo], 1, 6, fkeys) == 0) {\r

+ PrintAndLog("File reading error (dumpkeys.bin).");\r

+\r

+ fclose(fkeys);\r

+ return 2;\r

+ }\r

}\r

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

- fread(keyB[i], 1, 6, fkeys);\r

+\r

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

+ if (fread(keyB[sectorNo], 1, 6, fkeys) == 0) {\r

+ PrintAndLog("File reading error (dumpkeys.bin).");\r

+ fclose(fkeys);\r

+ return 2;\r

+ }\r

}\r

- \r

+\r

+ fclose(fkeys);\r

+\r

+ if ((fdump = fopen("dumpdata.bin","rb")) == NULL) {\r

+ PrintAndLog("Could not find file dumpdata.bin");\r

+ return 1;\r

+ } \r

PrintAndLog("Restoring dumpdata.bin to card");\r

\r

PrintAndLog("Restoring dumpdata.bin to card");\r

\r

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

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

- UsbCommand c = {CMD_MIFARE_WRITEBL, {i*4 + j, keyType, 0}};\r

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

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

+ UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}};\r

memcpy(c.d.asBytes, key, 6);\r

\r

memcpy(c.d.asBytes, key, 6);\r

\r

- fread(bldata, 1, 16, fdump);\r

+ if (fread(bldata, 1, 16, fdump) == 0) {\r

+ PrintAndLog("File reading error (dumpdata.bin).");\r

+ fclose(fdump);\r

+ return 2;\r

+ }\r

\r

- if (j == 3) {\r

- bldata[0] = (keyA[i][0]);\r

- bldata[1] = (keyA[i][1]);\r

- bldata[2] = (keyA[i][2]);\r

- bldata[3] = (keyA[i][3]);\r

- bldata[4] = (keyA[i][4]);\r

- bldata[5] = (keyA[i][5]);\r

- bldata[10] = (keyB[i][0]);\r

- bldata[11] = (keyB[i][1]);\r

- bldata[12] = (keyB[i][2]);\r

- bldata[13] = (keyB[i][3]);\r

- bldata[14] = (keyB[i][4]);\r

- bldata[15] = (keyB[i][5]);\r

+ if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer\r

+ bldata[0] = (keyA[sectorNo][0]);\r

+ bldata[1] = (keyA[sectorNo][1]);\r

+ bldata[2] = (keyA[sectorNo][2]);\r

+ bldata[3] = (keyA[sectorNo][3]);\r

+ bldata[4] = (keyA[sectorNo][4]);\r

+ bldata[5] = (keyA[sectorNo][5]);\r

+ bldata[10] = (keyB[sectorNo][0]);\r

+ bldata[11] = (keyB[sectorNo][1]);\r

+ bldata[12] = (keyB[sectorNo][2]);\r

+ bldata[13] = (keyB[sectorNo][3]);\r

+ bldata[14] = (keyB[sectorNo][4]);\r

+ bldata[15] = (keyB[sectorNo][5]);\r

} \r

\r

} \r

\r

- PrintAndLog("Writing to block %2d: %s", i*4+j, sprint_hex(bldata, 16));\r

- \r

- /*\r

- PrintAndLog("Writing to block %2d: %s Confirm? [Y,N]", i*4+j, sprint_hex(bldata, 16));\r

- \r

- scanf("%c",&ch);\r

- if ((ch != 'y') && (ch != 'Y')){\r

- PrintAndLog("Aborting !");\r

- return 1;\r

- }\r

- */\r

+ PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));\r

\r

memcpy(c.d.asBytes + 10, bldata, 16);\r

SendCommand(&c);\r

\r

memcpy(c.d.asBytes + 10, bldata, 16);\r

SendCommand(&c);\r

- UsbCommand *resp = WaitForResponseTimeout(CMD_ACK, 1500);\r

\r

- if (resp != NULL) {\r

- uint8_t isOK = resp->arg[0] & 0xff;\r

+ UsbCommand resp;\r

+ if (WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r

+ uint8_t isOK = resp.arg[0] & 0xff;\r

PrintAndLog("isOk:%02x", isOK);\r

} else {\r

PrintAndLog("Command execute timeout");\r

PrintAndLog("isOk:%02x", isOK);\r

} else {\r

PrintAndLog("Command execute timeout");\r

}\r

\r

fclose(fdump);\r

}\r

\r

fclose(fdump);\r

- fclose(fkeys);\r

return 0;\r

}\r

\r

int CmdHF14AMfNested(const char *Cmd)\r

{\r

int i, j, res, iterations;\r

return 0;\r

}\r

\r

int CmdHF14AMfNested(const char *Cmd)\r

{\r

int i, j, res, iterations;\r

- sector * e_sector = NULL;\r

+ sector *e_sector = NULL;\r

uint8_t blockNo = 0;\r

uint8_t keyType = 0;\r

uint8_t trgBlockNo = 0;\r

uint8_t trgKeyType = 0;\r

uint8_t blockNo = 0;\r

uint8_t keyType = 0;\r

uint8_t trgBlockNo = 0;\r

uint8_t trgKeyType = 0;\r

- uint8_t blDiff = 0;\r

- int SectorsCnt = 0;\r

+ uint8_t SectorsCnt = 0;\r

uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r

- uint8_t keyBlock[16 * 6];\r

+ uint8_t keyBlock[14*6];\r

uint64_t key64 = 0;\r

- int transferToEml = 0;\r

+ bool transferToEml = false;\r

\r

- int createDumpFile = 0;\r

+ bool createDumpFile = false;\r

FILE *fkeys;\r

uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r

uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r

FILE *fkeys;\r

uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r

uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};\r

PrintAndLog("d - write keys to binary file");\r

PrintAndLog(" ");\r

PrintAndLog(" sample1: hf mf nested 1 0 A FFFFFFFFFFFF ");\r

PrintAndLog("d - write keys to binary file");\r

PrintAndLog(" ");\r

PrintAndLog(" sample1: hf mf nested 1 0 A FFFFFFFFFFFF ");\r

- PrintAndLog(" sample1: hf mf nested 1 0 A FFFFFFFFFFFF t ");\r

- PrintAndLog(" sample1: hf mf nested 1 0 A FFFFFFFFFFFF d ");\r

- PrintAndLog(" sample2: hf mf nested o 0 A FFFFFFFFFFFF 4 A");\r

+ PrintAndLog(" sample2: hf mf nested 1 0 A FFFFFFFFFFFF t ");\r

+ PrintAndLog(" sample3: hf mf nested 1 0 A FFFFFFFFFFFF d ");\r

+ PrintAndLog(" sample4: hf mf nested o 0 A FFFFFFFFFFFF 4 A");\r

return 0;\r

} \r

\r

cmdp = param_getchar(Cmd, 0);\r

blockNo = param_get8(Cmd, 1);\r

ctmp = param_getchar(Cmd, 2);\r

return 0;\r

} \r

\r

cmdp = param_getchar(Cmd, 0);\r

blockNo = param_get8(Cmd, 1);\r

ctmp = param_getchar(Cmd, 2);\r

- if (ctmp == 0x00) {\r

+ \r

+ if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r

PrintAndLog("Key type must be A or B");\r

return 1;\r

}\r

PrintAndLog("Key type must be A or B");\r

return 1;\r

}\r

- if (ctmp != 'A' && ctmp != 'a') keyType = 1;\r

+ \r

+ if (ctmp != 'A' && ctmp != 'a') \r

+ keyType = 1;\r

+ \r

if (param_gethex(Cmd, 3, key, 12)) {\r

PrintAndLog("Key must include 12 HEX symbols");\r

return 1;\r

if (param_gethex(Cmd, 3, key, 12)) {\r

PrintAndLog("Key must include 12 HEX symbols");\r

return 1;\r

cmdp = 'o';\r

trgBlockNo = param_get8(Cmd, 4);\r

ctmp = param_getchar(Cmd, 5);\r

cmdp = 'o';\r

trgBlockNo = param_get8(Cmd, 4);\r

ctmp = param_getchar(Cmd, 5);\r

- if (ctmp == 0x00) {\r

+ if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r

PrintAndLog("Target key type must be A or B");\r

return 1;\r

}\r

PrintAndLog("Target key type must be A or B");\r

return 1;\r

}\r

- if (ctmp != 'A' && ctmp != 'a') trgKeyType = 1;\r

+ if (ctmp != 'A' && ctmp != 'a') \r

+ trgKeyType = 1;\r

} else {\r

+ \r

switch (cmdp) {\r

case '0': SectorsCnt = 05; break;\r

case '1': SectorsCnt = 16; break;\r

case '2': SectorsCnt = 32; break;\r

switch (cmdp) {\r

case '0': SectorsCnt = 05; break;\r

case '1': SectorsCnt = 16; break;\r

case '2': SectorsCnt = 32; break;\r

- case '4': SectorsCnt = 64; break;\r

+ case '4': SectorsCnt = 40; break;\r

default: SectorsCnt = 16;\r

}\r

\r

ctmp = param_getchar(Cmd, 4);\r

default: SectorsCnt = 16;\r

}\r

\r

ctmp = param_getchar(Cmd, 4);\r

- if (ctmp == 't' || ctmp == 'T') transferToEml = 1;\r

- else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1;\r

+ if (ctmp == 't' || ctmp == 'T') transferToEml = true;\r

+ else if (ctmp == 'd' || ctmp == 'D') createDumpFile = true;\r

\r

ctmp = param_getchar(Cmd, 6);\r

transferToEml |= (ctmp == 't' || ctmp == 'T');\r

transferToEml |= (ctmp == 'd' || ctmp == 'D');\r

\r

ctmp = param_getchar(Cmd, 6);\r

transferToEml |= (ctmp == 't' || ctmp == 'T');\r

transferToEml |= (ctmp == 'd' || ctmp == 'D');\r

\r

- PrintAndLog("--block no:%02x key type:%02x key:%s etrans:%d", blockNo, keyType, sprint_hex(key, 6), transferToEml);\r

- if (cmdp == 'o')\r

- PrintAndLog("--target block no:%02x target key type:%02x ", trgBlockNo, trgKeyType);\r

-\r

if (cmdp == 'o') {\r

- if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock)) {\r

- PrintAndLog("Nested error.");\r

+ PrintAndLog("--target block no:%3d, target key type:%c ", trgBlockNo, trgKeyType?'B':'A');\r

+ int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true);\r

+ if (isOK) {\r

+ switch (isOK) {\r

+ case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r

+ case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r

+ case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;\r

+ default : PrintAndLog("Unknown Error.\n");\r

+ }\r

return 2;\r

}\r

return 2;\r

}\r

-\r

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

- PrintAndLog("count=%d key= %s", i, sprint_hex(keyBlock + i * 6, 6));\r

- }\r

- \r

- // test keys\r

- res = mfCheckKeys(trgBlockNo, trgKeyType, 8, keyBlock, &key64);\r

- if (res)\r

- res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);\r

- if (!res) {\r

- PrintAndLog("Found valid key:%012llx", key64);\r

+ key64 = bytes_to_num(keyBlock, 6);\r

+ if (key64) {\r

+ PrintAndLog("Found valid key:%012"llx, key64);\r

\r

// transfer key to the emulator\r

if (transferToEml) {\r

\r

// transfer key to the emulator\r

if (transferToEml) {\r

- mfEmlGetMem(keyBlock, (trgBlockNo / 4) * 4 + 3, 1);\r

+ uint8_t sectortrailer;\r

+ if (trgBlockNo < 32*4) { // 4 block sector\r

+ sectortrailer = (trgBlockNo & 0x03) + 3;\r

+ } else { // 16 block sector\r

+ sectortrailer = (trgBlockNo & 0x0f) + 15;\r

+ }\r

+ mfEmlGetMem(keyBlock, sectortrailer, 1);\r

\r

if (!trgKeyType)\r

num_to_bytes(key64, 6, keyBlock);\r

else\r

num_to_bytes(key64, 6, &keyBlock[10]);\r

\r

if (!trgKeyType)\r

num_to_bytes(key64, 6, keyBlock);\r

else\r

num_to_bytes(key64, 6, &keyBlock[10]);\r

- mfEmlSetMem(keyBlock, (trgBlockNo / 4) * 4 + 3, 1); \r

+ mfEmlSetMem(keyBlock, sectortrailer, 1); \r

}\r

} else {\r

PrintAndLog("No valid key found");\r

}\r

else { // ------------------------------------ multiple sectors working\r

}\r

} else {\r

PrintAndLog("No valid key found");\r

}\r

else { // ------------------------------------ multiple sectors working\r

- blDiff = blockNo % 4;\r

- PrintAndLog("Block shift=%d", blDiff);\r

+ clock_t time1;\r

+ time1 = clock();\r

+\r

e_sector = calloc(SectorsCnt, sizeof(sector));\r

if (e_sector == NULL) return 1;\r

\r

e_sector = calloc(SectorsCnt, sizeof(sector));\r

if (e_sector == NULL) return 1;\r

\r

- //test current key 4 sectors\r

+ //test current key and additional standard keys first\r

memcpy(keyBlock, key, 6);\r

- num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 1 * 6));\r

- num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 2 * 6));\r

- num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 3 * 6));\r

- num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 4 * 6));\r

+ num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 1 * 6));\r

+ num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 2 * 6));\r

+ num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 3 * 6));\r

+ num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 4 * 6));\r

num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 5 * 6));\r

+ num_to_bytes(0x4d3a99c351dd, 6, (uint8_t*)(keyBlock + 6 * 6));\r

+ num_to_bytes(0x1a982c7e459a, 6, (uint8_t*)(keyBlock + 7 * 6));\r

+ num_to_bytes(0xd3f7d3f7d3f7, 6, (uint8_t*)(keyBlock + 8 * 6));\r

+ num_to_bytes(0x714c5c886e97, 6, (uint8_t*)(keyBlock + 9 * 6));\r

+ num_to_bytes(0x587ee5f9350f, 6, (uint8_t*)(keyBlock + 10 * 6));\r

+ num_to_bytes(0xa0478cc39091, 6, (uint8_t*)(keyBlock + 11 * 6));\r

+ num_to_bytes(0x533cb6c723f6, 6, (uint8_t*)(keyBlock + 12 * 6));\r

+ num_to_bytes(0x8fd0a4f256e9, 6, (uint8_t*)(keyBlock + 13 * 6));\r

\r

PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r

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

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

if (e_sector[i].foundKey[j]) continue;\r

\r

PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);\r

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

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

if (e_sector[i].foundKey[j]) continue;\r

\r

- res = mfCheckKeys(i * 4 + blDiff, j, 6, keyBlock, &key64);\r

+ res = mfCheckKeys(FirstBlockOfSector(i), j, true, 6, keyBlock, &key64);\r

\r

if (!res) {\r

e_sector[i].Key[j] = key64;\r

e_sector[i].foundKey[j] = 1;\r

}\r

\r

if (!res) {\r

e_sector[i].Key[j] = key64;\r

e_sector[i].foundKey[j] = 1;\r

}\r

- } \r

+ }\r

\r

// nested sectors\r

iterations = 0;\r

PrintAndLog("nested...");\r

\r

// nested sectors\r

iterations = 0;\r

PrintAndLog("nested...");\r

+ bool calibrate = true;\r

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

- for (trgBlockNo = blDiff; trgBlockNo < SectorsCnt * 4; trgBlockNo = trgBlockNo + 4) \r

+ for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r

for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { \r

- if (e_sector[trgBlockNo / 4].foundKey[trgKeyType]) continue;\r

- if (mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock)) continue;\r

+ if (e_sector[sectorNo].foundKey[trgKeyType]) continue;\r

+ PrintAndLog("-----------------------------------------------");\r

+ int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);\r

+ if(isOK) {\r

+ switch (isOK) {\r

+ case -1 : PrintAndLog("Error: No response from Proxmark.\n"); break;\r

+ case -2 : PrintAndLog("Button pressed. Aborted.\n"); break;\r

+ case -3 : PrintAndLog("Tag isn't vulnerable to Nested Attack (random numbers are not predictable).\n"); break;\r

+ default : PrintAndLog("Unknown Error.\n");\r

+ }\r

+ free(e_sector);\r

+ return 2;\r

+ } else {\r

+ calibrate = false;\r

+ }\r

\r

iterations++;\r

\r

iterations++;\r

- \r

- //try keys from nested\r

- res = mfCheckKeys(trgBlockNo, trgKeyType, 8, keyBlock, &key64);\r

- if (res)\r

- res = mfCheckKeys(trgBlockNo, trgKeyType, 8, &keyBlock[6 * 8], &key64);\r

- if (!res) {\r

- PrintAndLog("Found valid key:%012llx", key64); \r

- e_sector[trgBlockNo / 4].foundKey[trgKeyType] = 1;\r

- e_sector[trgBlockNo / 4].Key[trgKeyType] = key64;\r

+\r

+ key64 = bytes_to_num(keyBlock, 6);\r

+ if (key64) {\r

+ PrintAndLog("Found valid key:%012"llx, key64);\r

+ e_sector[sectorNo].foundKey[trgKeyType] = 1;\r

+ e_sector[sectorNo].Key[trgKeyType] = key64;\r

}\r

+ }\r

}\r

\r

}\r

\r

- PrintAndLog("Iterations count: %d", iterations);\r

+ printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)clock() - time1)/CLOCKS_PER_SEC, ((float)clock() - time1)/iterations/CLOCKS_PER_SEC);\r

+ \r

+ PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);\r

//print them\r

PrintAndLog("|---|----------------|---|----------------|---|");\r

PrintAndLog("|sec|key A |res|key B |res|");\r

PrintAndLog("|---|----------------|---|----------------|---|");\r

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

//print them\r

PrintAndLog("|---|----------------|---|----------------|---|");\r

PrintAndLog("|sec|key A |res|key B |res|");\r

PrintAndLog("|---|----------------|---|----------------|---|");\r

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

- PrintAndLog("|%03d| %012llx | %d | %012llx | %d |", i, \r

+ PrintAndLog("|%03d| %012"llx" | %d | %012"llx" | %d |", i,\r

e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);\r

}\r

PrintAndLog("|---|----------------|---|----------------|---|");\r

e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]);\r

}\r

PrintAndLog("|---|----------------|---|----------------|---|");\r

// transfer them to the emulator\r

if (transferToEml) {\r

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

// transfer them to the emulator\r

if (transferToEml) {\r

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

- mfEmlGetMem(keyBlock, i * 4 + 3, 1);\r

+ mfEmlGetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r

if (e_sector[i].foundKey[0])\r

num_to_bytes(e_sector[i].Key[0], 6, keyBlock);\r

if (e_sector[i].foundKey[1])\r

num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);\r

if (e_sector[i].foundKey[0])\r

num_to_bytes(e_sector[i].Key[0], 6, keyBlock);\r

if (e_sector[i].foundKey[1])\r

num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);\r

- mfEmlSetMem(keyBlock, i * 4 + 3, 1);\r

+ mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r

} \r

}\r

\r

} \r

}\r

\r

free(e_sector);\r

return 1;\r

}\r

free(e_sector);\r

return 1;\r

}\r

- PrintAndLog("Printing keys to bynary file dumpkeys.bin...");\r

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

+ PrintAndLog("Printing keys to binary file dumpkeys.bin...");\r

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

if (e_sector[i].foundKey[0]){\r

num_to_bytes(e_sector[i].Key[0], 6, tempkey);\r

fwrite ( tempkey, 1, 6, fkeys );\r

if (e_sector[i].foundKey[0]){\r

num_to_bytes(e_sector[i].Key[0], 6, tempkey);\r

fwrite ( tempkey, 1, 6, fkeys );\r

fwrite ( &standart, 1, 6, fkeys );\r

}\r

fwrite ( &standart, 1, 6, fkeys );\r

}\r

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

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

if (e_sector[i].foundKey[1]){\r

num_to_bytes(e_sector[i].Key[1], 6, tempkey);\r

fwrite ( tempkey, 1, 6, fkeys );\r

if (e_sector[i].foundKey[1]){\r

num_to_bytes(e_sector[i].Key[1], 6, tempkey);\r

fwrite ( tempkey, 1, 6, fkeys );\r

\r

free(e_sector);\r

}\r

\r

free(e_sector);\r

}\r

-\r

return 0;\r

}\r

\r

return 0;\r

}\r

\r

-static uint32_t\r

-get_trailer_block (uint32_t uiBlock)\r

-{\r

- // Test if we are in the small or big sectors\r

- uint32_t trailer_block = 0;\r

- if (uiBlock < 128) {\r

- trailer_block = uiBlock + (3 - (uiBlock % 4));\r

- } else {\r

- trailer_block = uiBlock + (15 - (uiBlock % 16));\r

- }\r

- return trailer_block;\r

-}\r

int CmdHF14AMfChk(const char *Cmd)\r

{\r

int CmdHF14AMfChk(const char *Cmd)\r

{\r

+ if (strlen(Cmd)<3) {\r

+ PrintAndLog("Usage: hf mf chk <block number>|<*card memory> <key type (A/B/?)> [t|d] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r

+ PrintAndLog(" * - all sectors");\r

+ PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r

+ PrintAndLog("d - write keys to binary file\n");\r

+ PrintAndLog("t - write keys to emulator memory");\r

+ PrintAndLog(" sample: hf mf chk 0 A 1234567890ab keys.dic");\r

+ PrintAndLog(" hf mf chk *1 ? t");\r

+ PrintAndLog(" hf mf chk *1 ? d");\r

+ return 0;\r

+ } \r

+\r

FILE * f;\r

- char filename[256]={0};\r

+ char filename[FILE_PATH_SIZE]={0};\r

char buf[13];\r

uint8_t *keyBlock = NULL, *p;\r

uint8_t stKeyBlock = 20;\r

char buf[13];\r

uint8_t *keyBlock = NULL, *p;\r

uint8_t stKeyBlock = 20;\r

keyBlock = calloc(stKeyBlock, 6);\r

if (keyBlock == NULL) return 1;\r

\r

keyBlock = calloc(stKeyBlock, 6);\r

if (keyBlock == NULL) return 1;\r

\r

- num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 0 * 6)); // Default key (first key used by program if no user defined key)\r

- num_to_bytes(0x000000000000, 6, (uint8_t*)(keyBlock + 1 * 6)); // Blank key\r

- num_to_bytes(0xa0a1a2a3a4a5, 6, (uint8_t*)(keyBlock + 2 * 6)); // NFCForum MAD key\r

- num_to_bytes(0xb0b1b2b3b4b5, 6, (uint8_t*)(keyBlock + 3 * 6));\r

- num_to_bytes(0xaabbccddeeff, 6, (uint8_t*)(keyBlock + 4 * 6));\r

- num_to_bytes(0x4d3a99c351dd, 6, (uint8_t*)(keyBlock + 5 * 6));\r

- num_to_bytes(0x1a982c7e459a, 6, (uint8_t*)(keyBlock + 6 * 6));\r

- num_to_bytes(0xd3f7d3f7d3f7, 6, (uint8_t*)(keyBlock + 7 * 6));\r

- num_to_bytes(0x714c5c886e97, 6, (uint8_t*)(keyBlock + 8 * 6));\r

- num_to_bytes(0x587ee5f9350f, 6, (uint8_t*)(keyBlock + 9 * 6));\r

- num_to_bytes(0xa0478cc39091, 6, (uint8_t*)(keyBlock + 10 * 6));\r

- num_to_bytes(0x533cb6c723f6, 6, (uint8_t*)(keyBlock + 11 * 6));\r

- num_to_bytes(0x8fd0a4f256e9, 6, (uint8_t*)(keyBlock + 12 * 6));\r

- \r

- if (strlen(Cmd)<3) {\r

- PrintAndLog("Usage: hf mf chk <block number>/<*card memory> <key type (A/B/?)> [t] [<key (12 hex symbols)>] [<dic (*.dic)>]");\r

- PrintAndLog(" * - all sectors");\r

- PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r

-// PrintAndLog("d - write keys to binary file\n");\r

- \r

- PrintAndLog(" sample: hf mf chk 0 A 1234567890ab keys.dic");\r

- PrintAndLog(" hf mf chk *1 ? t");\r

- return 0;\r

- } \r

+ uint64_t defaultKeys[] =\r

+ {\r

+ 0xffffffffffff, // Default key (first key used by program if no user defined key)\r

+ 0x000000000000, // Blank key\r

+ 0xa0a1a2a3a4a5, // NFCForum MAD key\r

+ 0xb0b1b2b3b4b5,\r

+ 0xaabbccddeeff,\r

+ 0x4d3a99c351dd,\r

+ 0x1a982c7e459a,\r

+ 0xd3f7d3f7d3f7,\r

+ 0x714c5c886e97,\r

+ 0x587ee5f9350f,\r

+ 0xa0478cc39091,\r

+ 0x533cb6c723f6,\r

+ 0x8fd0a4f256e9\r

+ };\r

+ int defaultKeysSize = sizeof(defaultKeys) / sizeof(uint64_t);\r

+\r

+ for (int defaultKeyCounter = 0; defaultKeyCounter < defaultKeysSize; defaultKeyCounter++)\r

+ {\r

+ num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r

+ }\r

\r

if (param_getchar(Cmd, 0)=='*') {\r

blockNo = 3;\r

\r

if (param_getchar(Cmd, 0)=='*') {\r

blockNo = 3;\r

}\r

keyBlock = p;\r

}\r

keyBlock = p;\r

}\r

- PrintAndLog("chk key[%d] %02x%02x%02x%02x%02x%02x", keycnt,\r

+ PrintAndLog("chk key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r

(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r

(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);\r

keycnt++;\r

} else {\r

// May be a dic file\r

(keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r

(keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);\r

keycnt++;\r

} else {\r

// May be a dic file\r

- if ( param_getstr(Cmd, 2 + i,filename) > 255 ) {\r

+ if ( param_getstr(Cmd, 2 + i,filename) >= FILE_PATH_SIZE ) {\r

PrintAndLog("File name too long");\r

free(keyBlock);\r

return 2;\r

}\r

\r

if ( (f = fopen( filename , "r")) ) {\r

PrintAndLog("File name too long");\r

free(keyBlock);\r

return 2;\r

}\r

\r

if ( (f = fopen( filename , "r")) ) {\r

- while( !feof(f) ){\r

- memset(buf, 0, sizeof(buf));\r

- fgets(buf, sizeof(buf), f);\r

- \r

+ while( fgets(buf, sizeof(buf), f) ){\r

if (strlen(buf) < 12 || buf[11] == '\n')\r

continue;\r

\r

while (fgetc(f) != '\n' && !feof(f)) ; //goto next line\r

\r

if (strlen(buf) < 12 || buf[11] == '\n')\r

continue;\r

\r

while (fgetc(f) != '\n' && !feof(f)) ; //goto next line\r

\r

- if( buf[0]=='#' ) continue; //The line start with # is remcommnet,skip\r

+ if( buf[0]=='#' ) continue; //The line start with # is comment, skip\r

\r

if (!isxdigit(buf[0])){\r

PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);\r

\r

if (!isxdigit(buf[0])){\r

PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);\r

}\r

memset(keyBlock + 6 * keycnt, 0, 6);\r

num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r

}\r

memset(keyBlock + 6 * keycnt, 0, 6);\r

num_to_bytes(strtoll(buf, NULL, 16), 6, keyBlock + 6*keycnt);\r

- PrintAndLog("chk custom key[%d] %012llx", keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r

+ PrintAndLog("chk custom key[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r

keycnt++;\r

+ memset(buf, 0, sizeof(buf));\r

}\r

+ fclose(f);\r

} else {\r

PrintAndLog("File: %s: not found or locked.", filename);\r

free(keyBlock);\r

return 1;\r

} else {\r

PrintAndLog("File: %s: not found or locked.", filename);\r

free(keyBlock);\r

return 1;\r

- fclose(f);\r

+ \r

}\r

\r

if (keycnt == 0) {\r

}\r

\r

if (keycnt == 0) {\r

- PrintAndLog("No key specified,try default keys");\r

- for (;keycnt <=12; keycnt++)\r

- PrintAndLog("chk default key[%d] %02x%02x%02x%02x%02x%02x", keycnt,\r

- (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r

- (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);\r

+ PrintAndLog("No key specified, trying default keys");\r

+ for (;keycnt < defaultKeysSize; keycnt++)\r

+ PrintAndLog("chk default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,\r

+ (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2],\r

+ (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);\r

}\r

\r

}\r

\r

- for ( int t = !keyType ; t < 2 ; keyType==2?(t++):(t=2) ) {\r

+ // initialize storage for found keys\r

+ bool validKey[2][40];\r

+ uint8_t foundKey[2][40][6];\r

+ for (uint16_t t = 0; t < 2; t++) {\r

+ for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r

+ validKey[t][sectorNo] = false;\r

+ for (uint16_t i = 0; i < 6; i++) {\r

+ foundKey[t][sectorNo][i] = 0xff;\r

+ }\r

+ \r

+ for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) {\r

int b=blockNo;\r

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

- PrintAndLog("--SectorsCnt:%d block no:0x%02x key type:%C key count:%d ", i, b, t?'B':'A', keycnt);\r

- int size = keycnt>8?8:keycnt;\r

- for (int c = 0; c < keycnt; c+=size) {\r

- size=keycnt-c>8?8:keycnt-c; \r

- res = mfCheckKeys(b, t, size, keyBlock +6*c, &key64);\r

- if (res !=1) {\r

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

+ PrintAndLog("--sector:%2d, block:%3d, key type:%C, key count:%2d ", i, b, t?'B':'A', keycnt);\r

+ uint32_t max_keys = keycnt>USB_CMD_DATA_SIZE/6?USB_CMD_DATA_SIZE/6:keycnt;\r

+ for (uint32_t c = 0; c < keycnt; c+=max_keys) {\r

+ uint32_t size = keycnt-c>max_keys?max_keys:keycnt-c;\r

+ res = mfCheckKeys(b, t, true, size, &keyBlock[6*c], &key64);\r

+ if (res != 1) {\r

if (!res) {\r

- PrintAndLog("Found valid key:[%012llx]",key64);\r

- if (transferToEml) {\r

- uint8_t block[16];\r

- mfEmlGetMem(block, get_trailer_block(b), 1);\r

- num_to_bytes(key64, 6, block + t*10);\r

- mfEmlSetMem(block, get_trailer_block(b), 1);\r

- }\r

- break;\r

- }\r

- else {\r

- printf("Not found yet, keycnt:%d\r", c+size);\r

- fflush(stdout);\r

- }\r

+ PrintAndLog("Found valid key:[%012"llx"]",key64);\r

+ num_to_bytes(key64, 6, foundKey[t][i]);\r

+ validKey[t][i] = true;\r

+ } \r

} else {\r

PrintAndLog("Command execute timeout");\r

}\r

} else {\r

PrintAndLog("Command execute timeout");\r

}\r

b<127?(b+=4):(b+=16); \r

}\r

b<127?(b+=4):(b+=16); \r

}\r

- \r

- free(keyBlock);\r

\r

-/*\r

- // Create dump file\r

+ if (transferToEml) {\r

+ uint8_t block[16];\r

+ for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r

+ if (validKey[0][sectorNo] || validKey[1][sectorNo]) {\r

+ mfEmlGetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r

+ for (uint16_t t = 0; t < 2; t++) {\r

+ if (validKey[t][sectorNo]) {\r

+ memcpy(block + t*10, foundKey[t][sectorNo], 6);\r

+ }\r

+ mfEmlSetMem(block, FirstBlockOfSector(sectorNo) + NumBlocksPerSector(sectorNo) - 1, 1);\r

+ }\r

+ PrintAndLog("Found keys have been transferred to the emulator memory");\r

+ }\r

+\r

if (createDumpFile) {\r

- if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { \r

+ FILE *fkeys = fopen("dumpkeys.bin","wb");\r

+ if (fkeys == NULL) { \r

PrintAndLog("Could not create file dumpkeys.bin");\r

- free(e_sector);\r

+ free(keyBlock);\r

return 1;\r

}\r

return 1;\r

}\r

- PrintAndLog("Printing keys to bynary file dumpkeys.bin...");\r

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

- if (e_sector[i].foundKey[0]){\r

- num_to_bytes(e_sector[i].Key[0], 6, tempkey);\r

- fwrite ( tempkey, 1, 6, fkeys );\r

- }\r

- else{\r

- fwrite ( &standart, 1, 6, fkeys );\r

- }\r

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

- if (e_sector[i].foundKey[1]){\r

- num_to_bytes(e_sector[i].Key[1], 6, tempkey);\r

- fwrite ( tempkey, 1, 6, fkeys );\r

- }\r

- else{\r

- fwrite ( &standart, 1, 6, fkeys );\r

- }\r

+ for (uint16_t t = 0; t < 2; t++) {\r

+ fwrite(foundKey[t], 1, 6*SectorsCnt, fkeys);\r

}\r

fclose(fkeys);\r

}\r

fclose(fkeys);\r

+ PrintAndLog("Found keys have been dumped to file dumpkeys.bin. 0xffffffffffff has been inserted for unknown keys.");\r

}\r

-*/\r

- return 0;\r

+\r

+ free(keyBlock);\r

+ PrintAndLog("");\r

+ return 0;\r

}\r

\r

int CmdHF14AMf1kSim(const char *Cmd)\r

{\r

}\r

\r

int CmdHF14AMf1kSim(const char *Cmd)\r

{\r

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

- \r

- if (param_getchar(Cmd, 0) == 'h') {\r

- PrintAndLog("Usage: hf mf sim <uid (8 hex symbols)>");\r

- PrintAndLog(" sample: hf mf sim 0a0a0a0a ");\r

+ uint8_t uid[7] = {0, 0, 0, 0, 0, 0, 0};\r

+ uint8_t exitAfterNReads = 0;\r

+ uint8_t flags = 0;\r

+\r

+ uint8_t cmdp = param_getchar(Cmd, 0);\r

+ \r

+ if (cmdp == 'h' || cmdp == 'H') {\r

+ PrintAndLog("Usage: hf mf sim u <uid (8 hex symbols)> n <numreads> i x");\r

+ PrintAndLog(" h this help");\r

+ PrintAndLog(" u (Optional) UID. If not specified, the UID from emulator memory will be used");\r

+ PrintAndLog(" n (Optional) Automatically exit simulation after <numreads> blocks have been read by reader. 0 = infinite");\r

+ PrintAndLog(" i (Optional) Interactive, means that console will not be returned until simulation finishes or is aborted");\r

+ PrintAndLog(" x (Optional) Crack, performs the 'reader attack', nr/ar attack against a legitimate reader, fishes out the key(s)");\r

+ PrintAndLog("");\r

+ PrintAndLog(" sample: hf mf sim u 0a0a0a0a ");\r

return 0;\r

- } \r

- \r

- if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, uid, 8)) {\r

- PrintAndLog("UID must include 8 HEX symbols");\r

- return 1;\r

}\r

- PrintAndLog(" uid:%s ", sprint_hex(uid, 4));\r

- \r

- UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {0, 0, 0}};\r

- memcpy(c.d.asBytes, uid, 4);\r

- SendCommand(&c);\r

+ uint8_t pnr = 0;\r

+ if (param_getchar(Cmd, pnr) == 'u') {\r

+ if(param_gethex(Cmd, pnr+1, uid, 8) == 0)\r

+ {\r

+ flags |= FLAG_4B_UID_IN_DATA; // UID from packet\r

+ } else if(param_gethex(Cmd,pnr+1,uid,14) == 0) {\r

+ flags |= FLAG_7B_UID_IN_DATA;// UID from packet\r

+ } else {\r

+ PrintAndLog("UID, if specified, must include 8 or 14 HEX symbols");\r

+ return 1;\r

+ }\r

+ pnr +=2;\r

+ }\r

+ if (param_getchar(Cmd, pnr) == 'n') {\r

+ exitAfterNReads = param_get8(Cmd,pnr+1);\r

+ pnr += 2;\r

+ }\r

+ if (param_getchar(Cmd, pnr) == 'i' ) {\r

+ //Using a flag to signal interactiveness, least significant bit\r

+ flags |= FLAG_INTERACTIVE;\r

+ pnr++;\r

+ }\r

\r

- return 0;\r

+ if (param_getchar(Cmd, pnr) == 'x' ) {\r

+ //Using a flag to signal interactiveness, least significant bit\r

+ flags |= FLAG_NR_AR_ATTACK;\r

+ }\r

+ PrintAndLog(" uid:%s, numreads:%d, flags:%d (0x%02x) ",\r

+ flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):\r

+ flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): "N/A"\r

+ , exitAfterNReads, flags,flags);\r

+\r

+ UsbCommand c = {CMD_SIMULATE_MIFARE_CARD, {flags, exitAfterNReads,0}};\r

+ memcpy(c.d.asBytes, uid, sizeof(uid));\r

+ SendCommand(&c);\r

+\r

+ if(flags & FLAG_INTERACTIVE)\r

+ {\r

+ UsbCommand resp;\r

+ PrintAndLog("Press pm3-button to abort simulation");\r

+ while(! WaitForResponseTimeout(CMD_ACK,&resp,1500)) {\r

+ //We're waiting only 1.5 s at a time, otherwise we get the\r

+ // annoying message about "Waiting for a response... "\r

+ }\r

+ \r

+ return 0;\r

}\r

\r

int CmdHF14AMfDbg(const char *Cmd)\r

{\r

int dbgMode = param_get32ex(Cmd, 0, 0, 10);\r

if (dbgMode > 4) {\r

}\r

\r

int CmdHF14AMfDbg(const char *Cmd)\r

{\r

int dbgMode = param_get32ex(Cmd, 0, 0, 10);\r

if (dbgMode > 4) {\r

- PrintAndLog("Max debud mode parameter is 4 \n");\r

+ PrintAndLog("Max debug mode parameter is 4 \n");\r

}\r

\r

if (strlen(Cmd) < 1 || !param_getchar(Cmd, 0) || dbgMode > 4) {\r

PrintAndLog("Usage: hf mf dbg <debug level>");\r

PrintAndLog(" 0 - no debug messages");\r

PrintAndLog(" 1 - error messages");\r

}\r

\r

if (strlen(Cmd) < 1 || !param_getchar(Cmd, 0) || dbgMode > 4) {\r

PrintAndLog("Usage: hf mf dbg <debug level>");\r

PrintAndLog(" 0 - no debug messages");\r

PrintAndLog(" 1 - error messages");\r

- PrintAndLog(" 2 - all messages");\r

- PrintAndLog(" 4 - extended debug mode");\r

+ PrintAndLog(" 2 - plus information messages");\r

+ PrintAndLog(" 3 - plus debug messages");\r

+ PrintAndLog(" 4 - print even debug messages in timing critical functions");\r

+ PrintAndLog(" Note: this option therefore may cause malfunction itself");\r

return 0;\r

} \r

\r

return 0;\r

} \r

\r

int CmdHF14AMfEGet(const char *Cmd)\r

{\r

uint8_t blockNo = 0;\r

int CmdHF14AMfEGet(const char *Cmd)\r

{\r

uint8_t blockNo = 0;\r

- uint8_t data[3 * 16];\r

- int i;\r

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

\r

if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r

PrintAndLog("Usage: hf mf eget <block number>");\r

\r

if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r

PrintAndLog("Usage: hf mf eget <block number>");\r

} \r

\r

blockNo = param_get8(Cmd, 0);\r

} \r

\r

blockNo = param_get8(Cmd, 0);\r

- if (blockNo >= 32 * 4 + 8 * 16) {\r

- PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r

- return 1;\r

- }\r

\r

PrintAndLog(" ");\r

\r

PrintAndLog(" ");\r

- if (!mfEmlGetMem(data, blockNo, 3)) {\r

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

- PrintAndLog("data[%d]:%s", blockNo + i, sprint_hex(data + i * 16, 16));\r

- }\r

+ if (!mfEmlGetMem(data, blockNo, 1)) {\r

+ PrintAndLog("data[%3d]:%s", blockNo, sprint_hex(data, 16));\r

} else {\r

PrintAndLog("Command execute timeout");\r

}\r

} else {\r

PrintAndLog("Command execute timeout");\r

}\r

return 0;\r

}\r

\r

return 0;\r

}\r

\r

+\r

int CmdHF14AMfESet(const char *Cmd)\r

{\r

uint8_t memBlock[16];\r

int CmdHF14AMfESet(const char *Cmd)\r

{\r

uint8_t memBlock[16];\r

} \r

\r

blockNo = param_get8(Cmd, 0);\r

} \r

\r

blockNo = param_get8(Cmd, 0);\r

- if (blockNo >= 32 * 4 + 8 * 16) {\r

- PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r

- return 1;\r

- }\r

\r

if (param_gethex(Cmd, 1, memBlock, 32)) {\r

PrintAndLog("block data must include 32 HEX symbols");\r

\r

if (param_gethex(Cmd, 1, memBlock, 32)) {\r

PrintAndLog("block data must include 32 HEX symbols");\r

}\r

\r

// 1 - blocks count\r

}\r

\r

// 1 - blocks count\r

- UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNo, 1, 0}};\r

+ UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNo, 1, 0}};\r

memcpy(c.d.asBytes, memBlock, 16);\r

- SendCommand(&c);\r

- return 0;\r

+ SendCommand(&c);\r

+ return 0;\r

}\r

\r

}\r

\r

+\r

int CmdHF14AMfELoad(const char *Cmd)\r

{\r

FILE * f;\r

int CmdHF14AMfELoad(const char *Cmd)\r

{\r

FILE * f;\r

- char filename[20];\r

- char * fnameptr = filename;\r

- char buf[64];\r

- uint8_t buf8[64];\r

- int i, len, blockNum;\r

+ char filename[FILE_PATH_SIZE];\r

+ char *fnameptr = filename;\r

+ char buf[64] = {0x00};\r

+ uint8_t buf8[64] = {0x00};\r

+ int i, len, blockNum, numBlocks;\r

+ int nameParamNo = 1;\r

\r

- memset(filename, 0, sizeof(filename));\r

- memset(buf, 0, sizeof(buf));\r

-\r

- if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {\r

+ char ctmp = param_getchar(Cmd, 0);\r

+ \r

+ if ( ctmp == 'h' || ctmp == 0x00) {\r

PrintAndLog("It loads emul dump from the file `filename.eml`");\r

- PrintAndLog("Usage: hf mf eload <file name w/o `.eml`>");\r

+ PrintAndLog("Usage: hf mf eload [card memory] <file name w/o `.eml`>");\r

+ PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r

+ PrintAndLog("");\r

PrintAndLog(" sample: hf mf eload filename");\r

+ PrintAndLog(" hf mf eload 4 filename");\r

return 0;\r

} \r

\r

return 0;\r

} \r

\r

- len = strlen(Cmd);\r

- if (len > 14) len = 14;\r

+ switch (ctmp) {\r

+ case '0' : numBlocks = 5*4; break;\r

+ case '1' : \r

+ case '\0': numBlocks = 16*4; break;\r

+ case '2' : numBlocks = 32*4; break;\r

+ case '4' : numBlocks = 256; break;\r

+ default: {\r

+ numBlocks = 16*4;\r

+ nameParamNo = 0;\r

+ }\r

+\r

+ len = param_getstr(Cmd,nameParamNo,filename);\r

+ \r

+ if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;\r

\r

- memcpy(filename, Cmd, len);\r

fnameptr += len;\r

\r

sprintf(fnameptr, ".eml"); \r

fnameptr += len;\r

\r

sprintf(fnameptr, ".eml"); \r

// open file\r

f = fopen(filename, "r");\r

if (f == NULL) {\r

// open file\r

f = fopen(filename, "r");\r

if (f == NULL) {\r

- PrintAndLog("File not found or locked.");\r

+ PrintAndLog("File %s not found or locked", filename);\r

return 1;\r

}\r

\r

blockNum = 0;\r

while(!feof(f)){\r

memset(buf, 0, sizeof(buf));\r

return 1;\r

}\r

\r

blockNum = 0;\r

while(!feof(f)){\r

memset(buf, 0, sizeof(buf));\r

- fgets(buf, sizeof(buf), f);\r

-\r

+ \r

+ if (fgets(buf, sizeof(buf), f) == NULL) {\r

+ \r

+ if (blockNum >= numBlocks) break;\r

+ \r

+ PrintAndLog("File reading error.");\r

+ fclose(f);\r

+ return 2;\r

+ }\r

+ \r

if (strlen(buf) < 32){\r

if(strlen(buf) && feof(f))\r

break;\r

PrintAndLog("File content error. Block data must include 32 HEX symbols");\r

if (strlen(buf) < 32){\r

if(strlen(buf) && feof(f))\r

break;\r

PrintAndLog("File content error. Block data must include 32 HEX symbols");\r

+ fclose(f);\r

return 2;\r

}\r

return 2;\r

}\r

- for (i = 0; i < 32; i += 2)\r

- sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r

-// PrintAndLog("data[%02d]:%s", blockNum, sprint_hex(buf8, 16));\r

-\r

+ \r

+ for (i = 0; i < 32; i += 2) {\r

+ sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r

+ }\r

+ \r

if (mfEmlSetMem(buf8, blockNum, 1)) {\r

- PrintAndLog("Cant set emul block: %d", blockNum);\r

+ PrintAndLog("Cant set emul block: %3d", blockNum);\r

+ fclose(f);\r

return 3;\r

}\r

return 3;\r

}\r

+ printf(".");\r

blockNum++;\r

\r

blockNum++;\r

\r

- if (blockNum >= 32 * 4 + 8 * 16) break;\r

+ if (blockNum >= numBlocks) break;\r

}\r

fclose(f);\r

}\r

fclose(f);\r

+ printf("\n");\r

\r

- if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){\r

- PrintAndLog("File content error. There must be 64 blocks");\r

+ if ((blockNum != numBlocks)) {\r

+ PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks);\r

return 4;\r

}\r

return 4;\r

}\r

- PrintAndLog("Loaded from file: %s", filename);\r

- return 0;\r

+ PrintAndLog("Loaded %d blocks from file: %s", blockNum, filename);\r

+ return 0;\r

}\r

\r

}\r

\r

+\r

int CmdHF14AMfESave(const char *Cmd)\r

{\r

FILE * f;\r

int CmdHF14AMfESave(const char *Cmd)\r

{\r

FILE * f;\r

- char filename[20];\r

+ char filename[FILE_PATH_SIZE];\r

char * fnameptr = filename;\r

uint8_t buf[64];\r

char * fnameptr = filename;\r

uint8_t buf[64];\r

- int i, j, len;\r

+ int i, j, len, numBlocks;\r

+ int nameParamNo = 1;\r

\r

memset(filename, 0, sizeof(filename));\r

memset(buf, 0, sizeof(buf));\r

\r

memset(filename, 0, sizeof(filename));\r

memset(buf, 0, sizeof(buf));\r

\r

- if (param_getchar(Cmd, 0) == 'h') {\r

+ char ctmp = param_getchar(Cmd, 0);\r

+ \r

+ if ( ctmp == 'h' || ctmp == 'H') {\r

PrintAndLog("It saves emul dump into the file `filename.eml` or `cardID.eml`");\r

- PrintAndLog("Usage: hf mf esave [file name w/o `.eml`]");\r

+ PrintAndLog(" Usage: hf mf esave [card memory] [file name w/o `.eml`]");\r

+ PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r

+ PrintAndLog("");\r

PrintAndLog(" sample: hf mf esave ");\r

- PrintAndLog(" hf mf esave filename");\r

+ PrintAndLog(" hf mf esave 4");\r

+ PrintAndLog(" hf mf esave 4 filename");\r

return 0;\r

} \r

\r

return 0;\r

} \r

\r

- len = strlen(Cmd);\r

- if (len > 14) len = 14;\r

+ switch (ctmp) {\r

+ case '0' : numBlocks = 5*4; break;\r

+ case '1' : \r

+ case '\0': numBlocks = 16*4; break;\r

+ case '2' : numBlocks = 32*4; break;\r

+ case '4' : numBlocks = 256; break;\r

+ default: {\r

+ numBlocks = 16*4;\r

+ nameParamNo = 0;\r

+ }\r

+\r

+ len = param_getstr(Cmd,nameParamNo,filename);\r

+ \r

+ if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;\r

\r

+ // user supplied filename?\r

if (len < 1) {\r

- // get filename\r

+ // get filename (UID from memory)\r

if (mfEmlGetMem(buf, 0, 1)) {\r

- PrintAndLog("Cant get block: %d", 0);\r

- return 1;\r

+ PrintAndLog("Can\'t get UID from block: %d", 0);\r

+ len = sprintf(fnameptr, "dump");\r

+ fnameptr += len;\r

+ }\r

+ else {\r

+ for (j = 0; j < 7; j++, fnameptr += 2)\r

+ sprintf(fnameptr, "%02X", buf[j]);\r

}\r

- for (j = 0; j < 7; j++, fnameptr += 2)\r

- sprintf(fnameptr, "%02x", buf[j]); \r

} else {\r

- memcpy(filename, Cmd, len);\r

fnameptr += len;\r

}\r

\r

fnameptr += len;\r

}\r

\r

+ // add file extension\r

sprintf(fnameptr, ".eml"); \r

\r

// open file\r

f = fopen(filename, "w+");\r

\r

sprintf(fnameptr, ".eml"); \r

\r

// open file\r

f = fopen(filename, "w+");\r

\r

+ if ( !f ) {\r

+ PrintAndLog("Can't open file %s ", filename);\r

+ return 1;\r

+ }\r

+ \r

// put hex\r

- for (i = 0; i < 32 * 4 + 8 * 16; i++) {\r

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

if (mfEmlGetMem(buf, i, 1)) {\r

PrintAndLog("Cant get block: %d", i);\r

break;\r

}\r

for (j = 0; j < 16; j++)\r

if (mfEmlGetMem(buf, i, 1)) {\r

PrintAndLog("Cant get block: %d", i);\r

break;\r

}\r

for (j = 0; j < 16; j++)\r

- fprintf(f, "%02x", buf[j]); \r

+ fprintf(f, "%02X", buf[j]); \r

fprintf(f,"\n");\r

}\r

fclose(f);\r

\r

fprintf(f,"\n");\r

}\r

fclose(f);\r

\r

- PrintAndLog("Saved to file: %s", filename);\r

+ PrintAndLog("Saved %d blocks to file: %s", numBlocks, filename);\r

\r

return 0;\r

}\r

\r

return 0;\r

}\r

\r

+\r

int CmdHF14AMfECFill(const char *Cmd)\r

{\r

uint8_t keyType = 0;\r

int CmdHF14AMfECFill(const char *Cmd)\r

{\r

uint8_t keyType = 0;\r

-\r

+ uint8_t numSectors = 16;\r

+ \r

if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r

- PrintAndLog("Usage: hf mf efill <key A/B>");\r

- PrintAndLog("sample: hf mf efill A");\r

- PrintAndLog("Card data blocks transfers to card emulator memory.");\r

- PrintAndLog("Keys must be laid in the simulator memory. \n");\r

+ PrintAndLog("Usage: hf mf ecfill <key A/B> [card memory]");\r

+ PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r

+ PrintAndLog("");\r

+ PrintAndLog("samples: hf mf ecfill A");\r

+ PrintAndLog(" hf mf ecfill A 4");\r

+ PrintAndLog("Read card and transfer its data to emulator memory.");\r

+ PrintAndLog("Keys must be laid in the emulator memory. \n");\r

return 0;\r

} \r

\r

char ctmp = param_getchar(Cmd, 0);\r

return 0;\r

} \r

\r

char ctmp = param_getchar(Cmd, 0);\r

- if (ctmp == 0x00) {\r

+ if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r

PrintAndLog("Key type must be A or B");\r

return 1;\r

}\r

if (ctmp != 'A' && ctmp != 'a') keyType = 1;\r

\r

PrintAndLog("Key type must be A or B");\r

return 1;\r

}\r

if (ctmp != 'A' && ctmp != 'a') keyType = 1;\r

\r

- UsbCommand c = {CMD_MIFARE_EML_CARDLOAD, {0, keyType, 0}};\r

- SendCommand(&c);\r

- return 0;\r

+ ctmp = param_getchar(Cmd, 1);\r

+ switch (ctmp) {\r

+ case '0' : numSectors = 5; break;\r

+ case '1' : \r

+ case '\0': numSectors = 16; break;\r

+ case '2' : numSectors = 32; break;\r

+ case '4' : numSectors = 40; break;\r

+ default: numSectors = 16;\r

+ } \r

+\r

+ printf("--params: numSectors: %d, keyType:%d", numSectors, keyType);\r

+ UsbCommand c = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}};\r

+ SendCommand(&c);\r

+ return 0;\r

}\r

\r

}\r

\r

+\r

int CmdHF14AMfEKeyPrn(const char *Cmd)\r

{\r

int CmdHF14AMfEKeyPrn(const char *Cmd)\r

{\r

- int i,b=-1;\r

+ int i;\r

+ uint8_t numSectors;\r

uint8_t data[16];\r

uint64_t keyA, keyB;\r

\r

uint8_t data[16];\r

uint64_t keyA, keyB;\r

\r

+ if (param_getchar(Cmd, 0) == 'h') {\r

+ PrintAndLog("It prints the keys loaded in the emulator memory");\r

+ PrintAndLog("Usage: hf mf ekeyprn [card memory]");\r

+ PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");\r

+ PrintAndLog("");\r

+ PrintAndLog(" sample: hf mf ekeyprn 1");\r

+ return 0;\r

+ } \r

+\r

+ char cmdp = param_getchar(Cmd, 0);\r

+ \r

+ switch (cmdp) {\r

+ case '0' : numSectors = 5; break;\r

+ case '1' : \r

+ case '\0': numSectors = 16; break;\r

+ case '2' : numSectors = 32; break;\r

+ case '4' : numSectors = 40; break;\r

+ default: numSectors = 16;\r

+ } \r

+ \r

PrintAndLog("|---|----------------|----------------|");\r

PrintAndLog("|sec|key A |key B |");\r

PrintAndLog("|---|----------------|----------------|");\r

PrintAndLog("|sec|key A |key B |");\r

PrintAndLog("|---|----------------|----------------|");\r

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

- b<127?(b+=4):(b+=16);\r

- if (mfEmlGetMem(data, b, 1)) {\r

- PrintAndLog("error get block %d", b);\r

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

+ if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {\r

+ PrintAndLog("error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);\r

break;\r

}\r

keyA = bytes_to_num(data, 6);\r

keyB = bytes_to_num(data + 10, 6);\r

break;\r

}\r

keyA = bytes_to_num(data, 6);\r

keyB = bytes_to_num(data + 10, 6);\r

- PrintAndLog("|%03d| %012llx | %012llx |", i, keyA, keyB);\r

+ PrintAndLog("|%03d| %012"llx" | %012"llx" |", i, keyA, keyB);\r

}\r

PrintAndLog("|---|----------------|----------------|");\r

\r

return 0;\r

}\r

\r

}\r

PrintAndLog("|---|----------------|----------------|");\r

\r

return 0;\r

}\r

\r

+\r

int CmdHF14AMfCSetUID(const char *Cmd)\r

{\r

uint8_t wipeCard = 0;\r

int CmdHF14AMfCSetUID(const char *Cmd)\r

{\r

uint8_t wipeCard = 0;\r

- uint8_t uid[8];\r

- uint8_t oldUid[8];\r

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

+ uint8_t oldUid[8] = {0x00};\r

+ uint8_t atqa[2] = {0x00};\r

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

+ uint8_t atqaPresent = 1;\r

int res;\r

-\r

- if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r

- PrintAndLog("Usage: hf mf csetuid <UID 8 hex symbols> <w>");\r

- PrintAndLog("sample: hf mf csetuid 01020304 w");\r

- PrintAndLog("Set UID for magic Chinese card (only works with!!!)");\r

- PrintAndLog("If you want wipe card then add 'w' into command line. \n");\r

+ char ctmp;\r

+ int argi=0;\r

+\r

+ if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') {\r

+ PrintAndLog("Usage: hf mf csetuid <UID 8 hex symbols> [ATQA 4 hex symbols SAK 2 hex symbols] [w]");\r

+ PrintAndLog("sample: hf mf csetuid 01020304");\r

+ PrintAndLog("sample: hf mf csetuid 01020304 0004 08 w");\r

+ PrintAndLog("Set UID, ATQA, and SAK for magic Chinese card (only works with such cards)");\r

+ PrintAndLog("If you also want to wipe the card then add 'w' at the end of the command line.");\r

return 0;\r

- } \r

+ }\r

\r

- if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, uid, 8)) {\r

+ if (param_getchar(Cmd, argi) && param_gethex(Cmd, argi, uid, 8)) {\r

PrintAndLog("UID must include 8 HEX symbols");\r

return 1;\r

}\r

PrintAndLog("UID must include 8 HEX symbols");\r

return 1;\r

}\r

+ argi++;\r

\r

- char ctmp = param_getchar(Cmd, 1);\r

- if (ctmp == 'w' || ctmp == 'W') wipeCard = 1;\r

- \r

- PrintAndLog("--wipe card:%02x uid:%s", wipeCard, sprint_hex(uid, 4));\r

+ ctmp = param_getchar(Cmd, argi);\r

+ if (ctmp == 'w' || ctmp == 'W') {\r

+ wipeCard = 1;\r

+ atqaPresent = 0;\r

+ }\r

\r

- res = mfCSetUID(uid, oldUid, wipeCard);\r

+ if (atqaPresent) {\r

+ if (param_getchar(Cmd, argi)) {\r

+ if (param_gethex(Cmd, argi, atqa, 4)) {\r

+ PrintAndLog("ATQA must include 4 HEX symbols");\r

+ return 1;\r

+ }\r

+ argi++;\r

+ if (!param_getchar(Cmd, argi) || param_gethex(Cmd, argi, sak, 2)) {\r

+ PrintAndLog("SAK must include 2 HEX symbols");\r

+ return 1;\r

+ }\r

+ argi++;\r

+ } else\r

+ atqaPresent = 0;\r

+ }\r

+\r

+ if(!wipeCard) {\r

+ ctmp = param_getchar(Cmd, argi);\r

+ if (ctmp == 'w' || ctmp == 'W') {\r

+ wipeCard = 1;\r

+ }\r

+\r

+ PrintAndLog("--wipe card:%s uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4));\r

+\r

+ res = mfCSetUID(uid, (atqaPresent)?atqa:NULL, (atqaPresent)?sak:NULL, oldUid, wipeCard);\r

if (res) {\r

PrintAndLog("Can't set UID. error=%d", res);\r

return 1;\r

}\r

\r

PrintAndLog("old UID:%s", sprint_hex(oldUid, 4));\r

if (res) {\r

PrintAndLog("Can't set UID. error=%d", res);\r

return 1;\r

}\r

\r

PrintAndLog("old UID:%s", sprint_hex(oldUid, 4));\r

+ PrintAndLog("new UID:%s", sprint_hex(uid, 4));\r

return 0;\r

}\r

\r

int CmdHF14AMfCSetBlk(const char *Cmd)\r

{\r

return 0;\r

}\r

\r

int CmdHF14AMfCSetBlk(const char *Cmd)\r

{\r

- uint8_t uid[8];\r

- uint8_t memBlock[16];\r

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

uint8_t blockNo = 0;\r

+ bool wipeCard = FALSE;\r

int res;\r

- memset(memBlock, 0x00, sizeof(memBlock));\r

\r

if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r

\r

if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r

- PrintAndLog("Usage: hf mf csetblk <block number> <block data (32 hex symbols)>");\r

+ PrintAndLog("Usage: hf mf csetblk <block number> <block data (32 hex symbols)> [w]");\r

PrintAndLog("sample: hf mf csetblk 1 01020304050607080910111213141516");\r

- PrintAndLog("Set block data for magic Chinese card (only works with!!!)");\r

- PrintAndLog("If you want wipe card then add 'w' into command line. \n");\r

+ PrintAndLog("Set block data for magic Chinese card (only works with such cards)");\r

+ PrintAndLog("If you also want wipe the card then add 'w' at the end of the command line");\r

return 0;\r

} \r

\r

blockNo = param_get8(Cmd, 0);\r

return 0;\r

} \r

\r

blockNo = param_get8(Cmd, 0);\r

- if (blockNo >= 32 * 4 + 8 * 16) {\r

- PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r

- return 1;\r

- }\r

\r

if (param_gethex(Cmd, 1, memBlock, 32)) {\r

PrintAndLog("block data must include 32 HEX symbols");\r

return 1;\r

}\r

\r

if (param_gethex(Cmd, 1, memBlock, 32)) {\r

PrintAndLog("block data must include 32 HEX symbols");\r

return 1;\r

}\r

\r

- PrintAndLog("--block number:%02x data:%s", blockNo, sprint_hex(memBlock, 16));\r

+ char ctmp = param_getchar(Cmd, 2);\r

+ wipeCard = (ctmp == 'w' || ctmp == 'W');\r

+ PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));\r

\r

- res = mfCSetBlock(blockNo, memBlock, uid, 0, CSETBLOCK_SINGLE_OPER);\r

+ res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER);\r

if (res) {\r

- PrintAndLog("Can't write block. error=%d", res);\r

- return 1;\r

- }\r

- \r

- PrintAndLog("UID:%s", sprint_hex(uid, 4));\r

+ PrintAndLog("Can't write block. error=%d", res);\r

+ return 1;\r

+ }\r

return 0;\r

}\r

\r

return 0;\r

}\r

\r

+\r

int CmdHF14AMfCLoad(const char *Cmd)\r

{\r

FILE * f;\r

int CmdHF14AMfCLoad(const char *Cmd)\r

{\r

FILE * f;\r

- char filename[20];\r

+ char filename[FILE_PATH_SIZE] = {0x00};\r

char * fnameptr = filename;\r

- char buf[64];\r

- uint8_t buf8[64];\r

+ char buf[64] = {0x00};\r

+ uint8_t buf8[64] = {0x00};\r

uint8_t fillFromEmulator = 0;\r

- int i, len, blockNum, flags;\r

+ int i, len, blockNum, flags=0;\r

\r

- memset(filename, 0, sizeof(filename));\r

- memset(buf, 0, sizeof(buf));\r

-\r

if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {\r

- PrintAndLog("It loads magic Chinese card (only works with!!!) from the file `filename.eml`");\r

+ PrintAndLog("It loads magic Chinese card from the file `filename.eml`");\r

PrintAndLog("or from emulator memory (option `e`)");\r

PrintAndLog("Usage: hf mf cload <file name w/o `.eml`>");\r

PrintAndLog(" or: hf mf cload e ");\r

PrintAndLog("or from emulator memory (option `e`)");\r

PrintAndLog("Usage: hf mf cload <file name w/o `.eml`>");\r

PrintAndLog(" or: hf mf cload e ");\r

if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r

\r

if (fillFromEmulator) {\r

if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r

\r

if (fillFromEmulator) {\r

- flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r

for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {\r

if (mfEmlGetMem(buf8, blockNum, 1)) {\r

PrintAndLog("Cant get block: %d", blockNum);\r

return 2;\r

}\r

for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {\r

if (mfEmlGetMem(buf8, blockNum, 1)) {\r

PrintAndLog("Cant get block: %d", blockNum);\r

return 2;\r

}\r

- \r

- if (blockNum == 2) flags = 0;\r

- if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r

+ if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; // switch on field and send magic sequence\r

+ if (blockNum == 1) flags = 0; // just write\r

+ if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field.\r

\r

if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r

PrintAndLog("Cant set magic card block: %d", blockNum);\r

\r

if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r

PrintAndLog("Cant set magic card block: %d", blockNum);\r

return 0;\r

} else {\r

len = strlen(Cmd);\r

return 0;\r

} else {\r

len = strlen(Cmd);\r

- if (len > 14) len = 14;\r

+ if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;\r

\r

memcpy(filename, Cmd, len);\r

fnameptr += len;\r

\r

memcpy(filename, Cmd, len);\r

fnameptr += len;\r

}\r

\r

blockNum = 0;\r

}\r

\r

blockNum = 0;\r

- flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r

while(!feof(f)){\r

+ \r

memset(buf, 0, sizeof(buf));\r

- fgets(buf, sizeof(buf), f);\r

+ \r

+ if (fgets(buf, sizeof(buf), f) == NULL) {\r

+ fclose(f);\r

+ PrintAndLog("File reading error.");\r

+ return 2;\r

+ }\r

\r

- if (strlen(buf) < 32){\r

+ if (strlen(buf) < 32) {\r

if(strlen(buf) && feof(f))\r

break;\r

PrintAndLog("File content error. Block data must include 32 HEX symbols");\r

if(strlen(buf) && feof(f))\r

break;\r

PrintAndLog("File content error. Block data must include 32 HEX symbols");\r

+ fclose(f);\r

return 2;\r

}\r

for (i = 0; i < 32; i += 2)\r

sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r

\r

return 2;\r

}\r

for (i = 0; i < 32; i += 2)\r

sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r

\r

- if (blockNum == 2) flags = 0;\r

- if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r

+ if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; // switch on field and send magic sequence\r

+ if (blockNum == 1) flags = 0; // just write\r

+ if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field.\r

\r

if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r

\r

if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r

- PrintAndLog("Cant set magic card block: %d", blockNum);\r

+ PrintAndLog("Can't set magic card block: %d", blockNum);\r

return 3;\r

}\r

blockNum++;\r

return 3;\r

}\r

blockNum++;\r

PrintAndLog("Loaded from file: %s", filename);\r

return 0;\r

}\r

PrintAndLog("Loaded from file: %s", filename);\r

return 0;\r

}\r

+ return 0;\r

}\r

\r

int CmdHF14AMfCGetBlk(const char *Cmd) {\r

}\r

\r

int CmdHF14AMfCGetBlk(const char *Cmd) {\r

if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r

PrintAndLog("Usage: hf mf cgetblk <block number>");\r

PrintAndLog("sample: hf mf cgetblk 1");\r

if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r

PrintAndLog("Usage: hf mf cgetblk <block number>");\r

PrintAndLog("sample: hf mf cgetblk 1");\r

- PrintAndLog("Get block data from magic Chinese card (only works with!!!)\n");\r

+ PrintAndLog("Get block data from magic Chinese card (only works with such cards)\n");\r

return 0;\r

} \r

\r

blockNo = param_get8(Cmd, 0);\r

return 0;\r

} \r

\r

blockNo = param_get8(Cmd, 0);\r

- if (blockNo >= 32 * 4 + 8 * 16) {\r

- PrintAndLog("Block number must be in [0..255] as in MIFARE classic.");\r

- return 1;\r

- }\r

\r

- PrintAndLog("--block number:%02x ", blockNo);\r

+ PrintAndLog("--block number:%2d ", blockNo);\r

\r

res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER);\r

if (res) {\r

\r

res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER);\r

if (res) {\r

return 0;\r

}\r

\r

return 0;\r

}\r

\r

+\r

int CmdHF14AMfCGetSc(const char *Cmd) {\r

- uint8_t memBlock[16];\r

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

uint8_t sectorNo = 0;\r

int i, res, flags;\r

uint8_t sectorNo = 0;\r

int i, res, flags;\r

- memset(memBlock, 0x00, sizeof(memBlock));\r

\r

if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r

PrintAndLog("Usage: hf mf cgetsc <sector number>");\r

PrintAndLog("sample: hf mf cgetsc 0");\r

\r

if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r

PrintAndLog("Usage: hf mf cgetsc <sector number>");\r

PrintAndLog("sample: hf mf cgetsc 0");\r

- PrintAndLog("Get sector data from magic Chinese card (only works with!!!)\n");\r

+ PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n");\r

return 0;\r

} \r

\r

return 0;\r

} \r

\r

return 1;\r

}\r

\r

return 1;\r

}\r

\r

- PrintAndLog("--sector number:%02x ", sectorNo);\r

+ PrintAndLog("--sector number:%d ", sectorNo);\r

\r

flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r

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

\r

flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r

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

\r

res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags);\r

if (res) {\r

\r

res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags);\r

if (res) {\r

- PrintAndLog("Can't read block. %02x error=%d", sectorNo * 4 + i, res);\r

+ PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res);\r

return 1;\r

}\r

\r

return 1;\r

}\r

\r

- PrintAndLog("block %02x data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16));\r

+ PrintAndLog("block %3d data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16));\r

}\r

return 0;\r

}\r

\r

}\r

return 0;\r

}\r

\r

+\r

int CmdHF14AMfCSave(const char *Cmd) {\r

\r

FILE * f;\r

int CmdHF14AMfCSave(const char *Cmd) {\r

\r

FILE * f;\r

- char filename[20];\r

+ char filename[FILE_PATH_SIZE] = {0x00};\r

char * fnameptr = filename;\r

uint8_t fillFromEmulator = 0;\r

char * fnameptr = filename;\r

uint8_t fillFromEmulator = 0;\r

- uint8_t buf[64];\r

+ uint8_t buf[64] = {0x00};\r

int i, j, len, flags;\r

\r

int i, j, len, flags;\r

\r

- memset(filename, 0, sizeof(filename));\r

- memset(buf, 0, sizeof(buf));\r

+ // memset(filename, 0, sizeof(filename));\r

+ // memset(buf, 0, sizeof(buf));\r

\r

if (param_getchar(Cmd, 0) == 'h') {\r

PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");\r

\r

if (param_getchar(Cmd, 0) == 'h') {\r

PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`");\r

return 0;\r

} else {\r

len = strlen(Cmd);\r

return 0;\r

} else {\r

len = strlen(Cmd);\r

- if (len > 14) len = 14;\r

+ if (len > FILE_PATH_SIZE - 4) len = FILE_PATH_SIZE - 4;\r

\r

if (len < 1) {\r

// get filename\r

if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) {\r

PrintAndLog("Cant get block: %d", 0);\r

\r

if (len < 1) {\r

// get filename\r

if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) {\r

PrintAndLog("Cant get block: %d", 0);\r

- return 1;\r

+ len = sprintf(fnameptr, "dump");\r

+ fnameptr += len;\r

+ }\r

+ else {\r

+ for (j = 0; j < 7; j++, fnameptr += 2)\r

+ sprintf(fnameptr, "%02x", buf[j]); \r

}\r

- for (j = 0; j < 7; j++, fnameptr += 2)\r

- sprintf(fnameptr, "%02x", buf[j]); \r

} else {\r

memcpy(filename, Cmd, len);\r

fnameptr += len;\r

} else {\r

memcpy(filename, Cmd, len);\r

fnameptr += len;\r

// open file\r

f = fopen(filename, "w+");\r

\r

// open file\r

f = fopen(filename, "w+");\r

\r

+ if (f == NULL) {\r

+ PrintAndLog("File not found or locked.");\r

+ return 1;\r

+ }\r

+\r

// put hex\r

flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r

for (i = 0; i < 16 * 4; i++) {\r

// put hex\r

flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r

for (i = 0; i < 16 * 4; i++) {\r

}\r

\r

}\r

\r

+\r

int CmdHF14AMfSniff(const char *Cmd){\r

+\r

+ bool wantLogToFile = 0;\r

+ bool wantDecrypt = 0;\r

+ //bool wantSaveToEml = 0; TODO\r

+ bool wantSaveToEmlFile = 0;\r

+\r

+ //var \r

+ int res = 0;\r

+ int len = 0;\r

+ int blockLen = 0;\r

+ int pckNum = 0;\r

+ int num = 0;\r

+ uint8_t uid[7];\r

+ uint8_t uid_len;\r

+ uint8_t atqa[2] = {0x00};\r

+ uint8_t sak;\r

+ bool isTag;\r

+ uint8_t *buf = NULL;\r

+ uint16_t bufsize = 0;\r

+ uint8_t *bufPtr = NULL;\r

\r

- if (param_getchar(Cmd, 0) == 'h') {\r

- PrintAndLog("Usage: hf mf sniff ");\r

- PrintAndLog(" sample: hf mf sniff ");\r

+ char ctmp = param_getchar(Cmd, 0);\r

+ if ( ctmp == 'h' || ctmp == 'H' ) {\r

+ PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file.");\r

+ PrintAndLog("You can specify:");\r

+ PrintAndLog(" l - save encrypted sequence to logfile `uid.log`");\r

+ PrintAndLog(" d - decrypt sequence and put it to log file `uid.log`");\r

+ PrintAndLog(" n/a e - decrypt sequence, collect read and write commands and save the result of the sequence to emulator memory");\r

+ PrintAndLog(" f - decrypt sequence, collect read and write commands and save the result of the sequence to emulator dump file `uid.eml`");\r

+ PrintAndLog("Usage: hf mf sniff [l][d][e][f]");\r

+ PrintAndLog(" sample: hf mf sniff l d e");\r

return 0;\r

} \r

\r

return 0;\r

} \r

\r

- UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};\r

- SendCommand(&c);\r

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

+ ctmp = param_getchar(Cmd, i);\r

+ if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true;\r

+ if (ctmp == 'd' || ctmp == 'D') wantDecrypt = true;\r

+ //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO\r

+ if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;\r

+ }\r

+ \r

+ printf("-------------------------------------------------------------------------\n");\r

+ printf("Executing command. \n");\r

+ printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n");\r

+ printf("Press the key on pc keyboard to abort the client.\n");\r

+ printf("-------------------------------------------------------------------------\n");\r

\r

- return 0;\r

+ UsbCommand c = {CMD_MIFARE_SNIFFER, {0, 0, 0}};\r

+ clearCommandBuffer();\r

+ SendCommand(&c);\r

+\r

+ // wait cycle\r

+ while (true) {\r

+ printf(".");\r

+ fflush(stdout);\r

+ if (ukbhit()) {\r

+ getchar();\r

+ printf("\naborted via keyboard!\n");\r

+ break;\r

+ }\r

+ \r

+ UsbCommand resp;\r

+ if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {\r

+ res = resp.arg[0] & 0xff;\r

+ uint16_t traceLen = resp.arg[1];\r

+ len = resp.arg[2];\r

+\r

+ if (res == 0) return 0; // we are done\r

+\r

+ if (res == 1) { // there is (more) data to be transferred\r

+ if (pckNum == 0) { // first packet, (re)allocate necessary buffer\r

+ if (traceLen > bufsize) {\r

+ uint8_t *p;\r

+ if (buf == NULL) { // not yet allocated\r

+ p = malloc(traceLen);\r

+ } else { // need more memory\r

+ p = realloc(buf, traceLen);\r

+ }\r

+ if (p == NULL) {\r

+ PrintAndLog("Cannot allocate memory for trace");\r

+ free(buf);\r

+ return 2;\r

+ }\r

+ buf = p;\r

+ }\r

+ bufPtr = buf;\r

+ bufsize = traceLen;\r

+ memset(buf, 0x00, traceLen);\r

+ }\r

+ memcpy(bufPtr, resp.d.asBytes, len);\r

+ bufPtr += len;\r

+ pckNum++;\r

+ }\r

+\r

+ if (res == 2) { // received all data, start displaying\r

+ blockLen = bufPtr - buf;\r

+ bufPtr = buf;\r

+ printf(">\n");\r

+ PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);\r

+ while (bufPtr - buf < blockLen) {\r

+ bufPtr += 6; // skip (void) timing information\r

+ len = *((uint16_t *)bufPtr);\r

+ if(len & 0x8000) {\r

+ isTag = true;\r

+ len &= 0x7fff;\r

+ } else {\r

+ isTag = false;\r

+ }\r

+ bufPtr += 2;\r

+ if ((len == 14) && (bufPtr[0] == 0xff) && (bufPtr[1] == 0xff) && (bufPtr[12] == 0xff) && (bufPtr[13] == 0xff)) {\r

+ memcpy(uid, bufPtr + 2, 7);\r

+ memcpy(atqa, bufPtr + 2 + 7, 2);\r

+ uid_len = (atqa[0] & 0xC0) == 0x40 ? 7 : 4;\r

+ sak = bufPtr[11];\r

+ PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", \r

+ sprint_hex(uid + (7 - uid_len), uid_len),\r

+ atqa[1], \r

+ atqa[0], \r

+ sak);\r

+ if (wantLogToFile || wantDecrypt) {\r

+ FillFileNameByUID(logHexFileName, uid + (7 - uid_len), ".log", uid_len);\r

+ AddLogCurrentDT(logHexFileName);\r

+ } \r

+ if (wantDecrypt) \r

+ mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);\r

+ } else {\r

+ PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len));\r

+ if (wantLogToFile) \r

+ AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);\r

+ if (wantDecrypt) \r

+ mfTraceDecode(bufPtr, len, wantSaveToEmlFile);\r

+ num++; \r

+ }\r

+ bufPtr += len;\r

+ bufPtr += ((len-1)/8+1); // ignore parity\r

+ }\r

+ pckNum = 0;\r

+ }\r

+ } // resp not NULL\r

+ } // while (true)\r

+\r

+ free(buf);\r

+ return 0;\r

+}\r

+\r

+//needs nt, ar, at, Data to decrypt\r

+int CmdDecryptTraceCmds(const char *Cmd){\r

+ uint8_t data[50];\r

+ int len = 0;\r

+ param_gethex_ex(Cmd,3,data,&len);\r

+ return tryDecryptWord(param_get32ex(Cmd,0,0,16),param_get32ex(Cmd,1,0,16),param_get32ex(Cmd,2,0,16),data,len/2);\r

}\r

\r

static command_t CommandTable[] =\r

{\r

}\r

\r

static command_t CommandTable[] =\r

{\r

- {"help", CmdHelp, 1, "This help"},\r

- {"dbg", CmdHF14AMfDbg, 0, "Set default debug mode"},\r

+ {"help", CmdHelp, 1, "This help"},\r

+ {"dbg", CmdHF14AMfDbg, 0, "Set default debug mode"},\r

{"rdbl", CmdHF14AMfRdBl, 0, "Read MIFARE classic block"},\r

{"rdsc", CmdHF14AMfRdSc, 0, "Read MIFARE classic sector"},\r

{"dump", CmdHF14AMfDump, 0, "Dump MIFARE classic tag to binary file"},\r

{"rdbl", CmdHF14AMfRdBl, 0, "Read MIFARE classic block"},\r

{"rdsc", CmdHF14AMfRdSc, 0, "Read MIFARE classic sector"},\r

{"dump", CmdHF14AMfDump, 0, "Dump MIFARE classic tag to binary file"},\r

- {"restore", CmdHF14AMfRestore, 0, "Restore MIFARE classic binary file to BLANK tag"},\r

+ {"restore", CmdHF14AMfRestore, 0, "Restore MIFARE classic binary file to BLANK tag"},\r

{"wrbl", CmdHF14AMfWrBl, 0, "Write MIFARE classic block"},\r

- {"chk", CmdHF14AMfChk, 0, "Test block keys"},\r

- {"mifare", CmdHF14AMifare, 0, "Read parity error messages. param - <used card nonce>"},\r

+ {"chk", CmdHF14AMfChk, 0, "Test block keys"},\r

+ {"mifare", CmdHF14AMifare, 0, "Read parity error messages."},\r

{"nested", CmdHF14AMfNested, 0, "Test nested authentication"},\r

{"sniff", CmdHF14AMfSniff, 0, "Sniff card-reader communication"},\r

{"nested", CmdHF14AMfNested, 0, "Test nested authentication"},\r

{"sniff", CmdHF14AMfSniff, 0, "Sniff card-reader communication"},\r

- {"sim", CmdHF14AMf1kSim, 0, "Simulate MIFARE card"},\r

+ {"sim", CmdHF14AMf1kSim, 0, "Simulate MIFARE card"},\r

{"eclr", CmdHF14AMfEClear, 0, "Clear simulator memory block"},\r

{"eget", CmdHF14AMfEGet, 0, "Get simulator memory block"},\r

{"eset", CmdHF14AMfESet, 0, "Set simulator memory block"},\r

{"eload", CmdHF14AMfELoad, 0, "Load from file emul dump"},\r

{"esave", CmdHF14AMfESave, 0, "Save to file emul dump"},\r

{"ecfill", CmdHF14AMfECFill, 0, "Fill simulator memory with help of keys from simulator"},\r

{"eclr", CmdHF14AMfEClear, 0, "Clear simulator memory block"},\r

{"eget", CmdHF14AMfEGet, 0, "Get simulator memory block"},\r

{"eset", CmdHF14AMfESet, 0, "Set simulator memory block"},\r

{"eload", CmdHF14AMfELoad, 0, "Load from file emul dump"},\r

{"esave", CmdHF14AMfESave, 0, "Save to file emul dump"},\r

{"ecfill", CmdHF14AMfECFill, 0, "Fill simulator memory with help of keys from simulator"},\r

- {"ekeyprn", CmdHF14AMfEKeyPrn, 0, "Print keys from simulator memory"},\r

- {"csetuid", CmdHF14AMfCSetUID, 0, "Set UID for magic Chinese card"},\r

- {"csetblk", CmdHF14AMfCSetBlk, 0, "Write block into magic Chinese card"},\r

- {"cgetblk", CmdHF14AMfCGetBlk, 0, "Read block from magic Chinese card"},\r

- {"cgetsc", CmdHF14AMfCGetSc, 0, "Read sector from magic Chinese card"},\r

+ {"ekeyprn", CmdHF14AMfEKeyPrn, 0, "Print keys from simulator memory"},\r

+ {"csetuid", CmdHF14AMfCSetUID, 0, "Set UID for magic Chinese card"},\r

+ {"csetblk", CmdHF14AMfCSetBlk, 0, "Write block - Magic Chinese card"},\r

+ {"cgetblk", CmdHF14AMfCGetBlk, 0, "Read block - Magic Chinese card"},\r

+ {"cgetsc", CmdHF14AMfCGetSc, 0, "Read sector - Magic Chinese card"},\r

{"cload", CmdHF14AMfCLoad, 0, "Load dump into magic Chinese card"},\r

{"csave", CmdHF14AMfCSave, 0, "Save dump from magic Chinese card into file or emulator"},\r

{"cload", CmdHF14AMfCLoad, 0, "Load dump into magic Chinese card"},\r

{"csave", CmdHF14AMfCSave, 0, "Save dump from magic Chinese card into file or emulator"},\r

+ {"decrypt", CmdDecryptTraceCmds,1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},\r

{NULL, NULL, 0, NULL}\r

};\r

\r

int CmdHFMF(const char *Cmd)\r

{\r

// flush\r

{NULL, NULL, 0, NULL}\r

};\r

\r

int CmdHFMF(const char *Cmd)\r

{\r

// flush\r

- while (WaitForResponseTimeout(CMD_ACK, 500) != NULL) ;\r

+ WaitForResponseTimeout(CMD_ACK,NULL,100);\r

\r

CmdsParse(CommandTable, Cmd);\r

return 0;\r

\r

CmdsParse(CommandTable, Cmd);\r

return 0;\r