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

// High frequency MIFARE commands\r

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

\r

// High frequency MIFARE commands\r

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

\r

-#include "cmdhfmf.h"\r

-#include "./nonce2key/nonce2key.h"\r

+#include <inttypes.h>\r

+#include <string.h>\r

+#include <stdio.h>\r

+#include <stdlib.h>\r

+#include <ctype.h>\r

+#include "proxmark3.h"\r

+#include "cmdmain.h"\r

+#include "util.h"\r

+#include "ui.h"\r

+#include "mifarehost.h"\r

+#include "mifare.h"\r

+#include "mfkey.h"\r

+\r

+#define NESTED_SECTOR_RETRY 10 // how often we try mfested() until we give up\r

+\r

\r

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

\r

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

\r

+\r

int CmdHF14AMifare(const char *Cmd)\r

{\r

int CmdHF14AMifare(const char *Cmd)\r

{\r

- uint32_t uid = 0;\r

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

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

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

- \r

- start:\r

- clearCommandBuffer();\r

- SendCommand(&c);\r

- \r

- //flush queue\r

- while (ukbhit()) getchar();\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, 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

- 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

+ int isOK = 0;\r

+ uint64_t key = 0;\r

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

+ isOK = mfDarkside(&key);\r

+ switch (isOK) {\r

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

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

+ case -3 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator is not predictable)."); return 1;\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."); return 1;\r

+ case -5 : PrintAndLog("Aborted via keyboard."); return 1;\r

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

}\r

\r

PrintAndLog("");\r

return 0;\r

}\r

\r

}\r

\r

PrintAndLog("");\r

return 0;\r

}\r

\r

+\r

int CmdHF14AMfWrBl(const char *Cmd)\r

{\r

uint8_t blockNo = 0;\r

int CmdHF14AMfWrBl(const char *Cmd)\r

{\r

uint8_t blockNo = 0;\r

\r

// Read keys A from file\r

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

\r

// Read keys A from file\r

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

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

+ size_t bytes_read = fread(keyA[sectorNo], 1, 6, fin);\r

+ if (bytes_read != 6) {\r

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

fclose(fin);\r

return 2;\r

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

fclose(fin);\r

return 2;\r

\r

// Read keys B from file\r

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

\r

// Read keys B from file\r

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

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

+ size_t bytes_read = fread(keyB[sectorNo], 1, 6, fin);\r

+ if (bytes_read != 6) {\r

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

fclose(fin);\r

return 2;\r

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

fclose(fin);\r

return 2;\r

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

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

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

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

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

- \r

+ uint8_t tries = 0;\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

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

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

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

+ break;\r

+ } else if (tries == 2) { // on last try set defaults\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

} else {\r

- PrintAndLog("Could not get access rights for sector %2d. Trying with defaults...", sectorNo);\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

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

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

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

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

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

bool received = false;\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

- 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

- 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

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

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

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

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

SendCommand(&c);\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

+ 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

+ tries = 2;\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

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

+ }\r

+ if (received) {\r

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

+ if (isOK) break;\r

}\r

\r

}\r

\r

}\r

\r

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

}\r

\r

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

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

+ size_t bytes_read = fread(keyA[sectorNo], 1, 6, fkeys);\r

+ if (bytes_read != 6) {\r

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

-\r

fclose(fkeys);\r

return 2;\r

}\r

\r

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

fclose(fkeys);\r

return 2;\r

}\r

\r

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

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

+ size_t bytes_read = fread(keyB[sectorNo], 1, 6, fkeys);\r

+ if (bytes_read != 6) {\r

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

fclose(fkeys);\r

return 2;\r

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

fclose(fkeys);\r

return 2;\r

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

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

\r

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

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

\r

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

+ size_t bytes_read = fread(bldata, 1, 16, fdump);\r

+ if (bytes_read != 16) {\r

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

fclose(fdump);\r

return 2;\r

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

fclose(fdump);\r

return 2;\r

return 0;\r

}\r

\r

return 0;\r

}\r

\r

+\r

+typedef struct {\r

+ uint64_t Key[2];\r

+ int foundKey[2];\r

+} sector_t;\r

+\r

int CmdHF14AMfNested(const char *Cmd)\r

{\r

int i, j, res, iterations;\r

int CmdHF14AMfNested(const char *Cmd)\r

{\r

int i, j, res, iterations;\r

- sector *e_sector = NULL;\r

+ sector_t *e_sector = NULL;\r

uint8_t blockNo = 0;\r

uint8_t keyType = 0;\r

uint8_t trgBlockNo = 0;\r

uint8_t blockNo = 0;\r

uint8_t keyType = 0;\r

uint8_t trgBlockNo = 0;\r

}\r

key64 = bytes_to_num(keyBlock, 6);\r

if (key64) {\r

}\r

key64 = bytes_to_num(keyBlock, 6);\r

if (key64) {\r

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

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

\r

// transfer key to the emulator\r

if (transferToEml) {\r

\r

// transfer key to the emulator\r

if (transferToEml) {\r

}\r

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

}\r

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

- clock_t time1;\r

- time1 = clock();\r

+ uint64_t msclock1;\r

+ msclock1 = msclock();\r

\r

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

+ e_sector = calloc(SectorsCnt, sizeof(sector_t));\r

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

\r

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

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

\r

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

\r

key64 = bytes_to_num(keyBlock, 6);\r

if (key64) {\r

\r

key64 = bytes_to_num(keyBlock, 6);\r

if (key64) {\r

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

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

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

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

}\r

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

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

}\r

\r

}\r

\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

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

\r

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

//print them\r

\r

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

//print them\r

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

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

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

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

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

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

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

+ PrintAndLog("|%03d| %012" PRIx64 " | %d | %012" PRIx64 " | %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

if (!p) {\r

PrintAndLog("Cannot allocate memory for defKeys");\r

free(keyBlock);\r

if (!p) {\r

PrintAndLog("Cannot allocate memory for defKeys");\r

free(keyBlock);\r

+ fclose(f);\r

return 2;\r

}\r

keyBlock = p;\r

}\r

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

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

return 2;\r

}\r

keyBlock = p;\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[%2d] %012"llx, keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r

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

keycnt++;\r

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

}\r

keycnt++;\r

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

}\r

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

if (res != 1) {\r

if (!res) {\r

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

if (res != 1) {\r

if (!res) {\r

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

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

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

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

} \r

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

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

} \r

}\r

- } else if (tryMfk32_moebius(ar_resp[i+ATTACK_KEY_COUNT], &key)) {\r

+ } else if (mfkey32_moebius(ar_resp[i+ATTACK_KEY_COUNT], &key)) {\r

uint8_t sectorNum = ar_resp[i+ATTACK_KEY_COUNT].sector;\r

uint8_t keyType = ar_resp[i+ATTACK_KEY_COUNT].keytype;\r

\r

uint8_t sectorNum = ar_resp[i+ATTACK_KEY_COUNT].sector;\r

uint8_t keyType = ar_resp[i+ATTACK_KEY_COUNT].keytype;\r

\r

- PrintAndLog("M-Found Key%s for sector %02d: [%012"llx"]"\r

+ PrintAndLog("M-Found Key%s for sector %02d: [%012" PRIx64 "]"\r

, keyType ? "B" : "A"\r

, sectorNum\r

, key\r

, keyType ? "B" : "A"\r

, sectorNum\r

, key\r

\r

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

\r

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

\r

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

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

\r

fnameptr += len;\r

\r

fnameptr += len;\r

\r

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

\r

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

\r

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

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

\r

// user supplied filename?\r

if (len < 1) {\r

\r

// user supplied filename?\r

if (len < 1) {\r

}\r

keyA = bytes_to_num(data, 6);\r

keyB = bytes_to_num(data + 10, 6);\r

}\r

keyA = bytes_to_num(data, 6);\r

keyB = bytes_to_num(data + 10, 6);\r

- PrintAndLog("|%03d| %012"llx" | %012"llx" |", i, keyA, keyB);\r

+ PrintAndLog("|%03d| %012" PRIx64 " | %012" PRIx64 " |", i, keyA, keyB);\r

}\r

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

\r

}\r

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

\r

{\r

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

uint8_t blockNo = 0;\r

{\r

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

uint8_t blockNo = 0;\r

- bool wipeCard = FALSE;\r

+ bool wipeCard = false;\r

int res;\r

\r

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

int res;\r

\r

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

return 0;\r

} else {\r

len = strlen(Cmd);\r

return 0;\r

} else {\r

len = strlen(Cmd);\r

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

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

\r

memcpy(filename, Cmd, len);\r

fnameptr += len;\r

\r

memcpy(filename, Cmd, len);\r

fnameptr += len;\r

\r

if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r

PrintAndLog("Can't set magic card block: %d", blockNum);\r

\r

if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r

PrintAndLog("Can't set magic card block: %d", blockNum);\r

+ fclose(f);\r

return 3;\r

}\r

blockNum++;\r

return 3;\r

}\r

blockNum++;\r

return 0;\r

} else {\r

len = strlen(Cmd);\r

return 0;\r

} else {\r

len = strlen(Cmd);\r

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

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

\r

if (len < 1) {\r

// get filename\r

\r

if (len < 1) {\r

// get filename\r

uint16_t traceLen = resp.arg[1];\r

len = resp.arg[2];\r

\r

uint16_t traceLen = resp.arg[1];\r

len = resp.arg[2];\r

\r

- if (res == 0) return 0; // we are done\r

+ if (res == 0) { // we are done\r

+ free(buf);\r

+ return 0;\r

+ }\r

\r

if (res == 1) { // there is (more) data to be transferred\r

if (pckNum == 0) { // first packet, (re)allocate necessary buffer\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

+ if (traceLen > bufsize || buf == NULL) {\r

uint8_t *p;\r

if (buf == NULL) { // not yet allocated\r

p = malloc(traceLen);\r

uint8_t *p;\r

if (buf == NULL) { // not yet allocated\r

p = malloc(traceLen);\r