// High frequency MIFARE commands\r
//-----------------------------------------------------------------------------\r
\r
+#include "cmdhfmf.h"\r
+\r
#include <inttypes.h>\r
#include <string.h>\r
#include <stdio.h>\r
#include <ctype.h>\r
#include "proxmark3.h"\r
#include "cmdmain.h"\r
+#include "cmdhfmfhard.h"\r
#include "util.h"\r
+#include "util_posix.h"\r
+#include "usb_cmd.h"\r
#include "ui.h"\r
#include "mifarehost.h"\r
#include "mifare.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
-\r
int CmdHF14AMifare(const char *Cmd)\r
{\r
int isOK = 0;\r
uint64_t key = 0;\r
-\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
+ 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
+\r
PrintAndLog("");\r
return 0;\r
}\r
uint8_t keyType = 0;\r
uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};\r
- \r
+\r
char cmdp = 0x00;\r
\r
if (strlen(Cmd)<3) {\r
PrintAndLog("Usage: hf mf wrbl <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");\r
PrintAndLog(" sample: hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F");\r
return 0;\r
- } \r
+ }\r
\r
blockNo = param_get8(Cmd, 0);\r
cmdp = param_getchar(Cmd, 1);\r
}\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
+\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
uint8_t blockNo = 0;\r
uint8_t keyType = 0;\r
uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
- \r
+\r
char cmdp = 0x00;\r
\r
\r
PrintAndLog("Usage: hf mf rdbl <block number> <key A/B> <key (12 hex symbols)>");\r
PrintAndLog(" sample: hf mf rdbl 0 A FFFFFFFFFFFF ");\r
return 0;\r
- } \r
- \r
+ }\r
+\r
blockNo = param_get8(Cmd, 0);\r
cmdp = param_getchar(Cmd, 1);\r
if (cmdp == 0x00) {\r
return 1;\r
}\r
PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6));\r
- \r
+\r
UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}};\r
memcpy(c.d.asBytes, key, 6);\r
SendCommand(&c);\r
PrintAndLog("Usage: hf mf rdsc <sector number> <key A/B> <key (12 hex symbols)>");\r
PrintAndLog(" sample: hf mf rdsc 0 A FFFFFFFFFFFF ");\r
return 0;\r
- } \r
- \r
+ }\r
+\r
sectorNo = param_get8(Cmd, 0);\r
if (sectorNo > 39) {\r
PrintAndLog("Sector number must be less than 40");\r
return 1;\r
}\r
PrintAndLog("--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6));\r
- \r
+\r
UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}};\r
memcpy(c.d.asBytes, key, 6);\r
SendCommand(&c);\r
int CmdHF14AMfDump(const char *Cmd)\r
{\r
uint8_t sectorNo, blockNo;\r
- \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
+\r
FILE *fin;\r
FILE *fout;\r
- \r
+\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 '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
+ }\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(" hf mf dump 4");\r
return 0;\r
}\r
- \r
+\r
if ((fin = fopen("dumpkeys.bin","rb")) == NULL) {\r
PrintAndLog("Could not find file dumpkeys.bin");\r
return 1;\r
}\r
- \r
+\r
// Read keys A from file\r
for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
size_t bytes_read = fread(keyA[sectorNo], 1, 6, fin);\r
return 2;\r
}\r
}\r
- \r
+\r
// Read keys B from file\r
for (sectorNo=0; sectorNo<numSectors; sectorNo++) {\r
size_t bytes_read = fread(keyB[sectorNo], 1, 6, fin);\r
return 2;\r
}\r
}\r
- \r
+\r
fclose(fin);\r
\r
PrintAndLog("|-----------------------------------------|");\r
PrintAndLog("|-----------------------------------------|");\r
uint8_t tries = 0;\r
for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
- for (tries = 0; tries < 3; tries++) { \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
}\r
}\r
- \r
+\r
PrintAndLog("|-----------------------------------------|");\r
PrintAndLog("|----- Dumping all blocks to file... -----|");\r
PrintAndLog("|-----------------------------------------|");\r
- \r
+\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
- 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
+ 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
}\r
\r
if (isOK) {\r
- if ((fout = fopen("dumpdata.bin","wb")) == NULL) { \r
+ if ((fout = fopen("dumpdata.bin","wb")) == NULL) {\r
PrintAndLog("Could not create file name dumpdata.bin");\r
return 1;\r
}\r
fclose(fout);\r
PrintAndLog("Dumped %d blocks (%d bytes) to file dumpdata.bin", numblocks, 16*numblocks);\r
}\r
- \r
+\r
return 0;\r
}\r
\r
uint8_t keyA[40][6];\r
uint8_t keyB[40][6];\r
uint8_t numSectors;\r
- \r
+\r
FILE *fdump;\r
FILE *fkeys;\r
\r
char cmdp = param_getchar(Cmd, 0);\r
switch (cmdp) {\r
case '0' : numSectors = 5; break;\r
- case '1' : \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
\r
if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
PrintAndLog("Usage: hf mf restore [card memory]");\r
PrintAndLog("Could not find file dumpkeys.bin");\r
return 1;\r
}\r
- \r
+\r
for (sectorNo = 0; sectorNo < numSectors; sectorNo++) {\r
size_t bytes_read = fread(keyA[sectorNo], 1, 6, fkeys);\r
if (bytes_read != 6) {\r
if ((fdump = fopen("dumpdata.bin","rb")) == NULL) {\r
PrintAndLog("Could not find file dumpdata.bin");\r
return 1;\r
- } \r
+ }\r
PrintAndLog("Restoring dumpdata.bin to card");\r
\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
+\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
}\r
- \r
+\r
if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer\r
bldata[0] = (keyA[sectorNo][0]);\r
bldata[1] = (keyA[sectorNo][1]);\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 %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16));\r
- \r
+\r
memcpy(c.d.asBytes + 10, bldata, 16);\r
SendCommand(&c);\r
\r
}\r
}\r
}\r
- \r
+\r
fclose(fdump);\r
return 0;\r
}\r
uint8_t keyBlock[14*6];\r
uint64_t key64 = 0;\r
bool transferToEml = false;\r
- \r
+\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
- \r
+\r
char cmdp, ctmp;\r
\r
if (strlen(Cmd)<3) {\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
+ }\r
+\r
cmdp = param_getchar(Cmd, 0);\r
blockNo = param_get8(Cmd, 1);\r
ctmp = param_getchar(Cmd, 2);\r
- \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
- \r
- if (ctmp != 'A' && ctmp != 'a') \r
+\r
+ if (ctmp != 'A' && ctmp != 'a')\r
keyType = 1;\r
- \r
+\r
if (param_gethex(Cmd, 3, key, 12)) {\r
PrintAndLog("Key must include 12 HEX symbols");\r
return 1;\r
}\r
- \r
+\r
if (cmdp == 'o' || cmdp == 'O') {\r
cmdp = 'o';\r
trgBlockNo = param_get8(Cmd, 4);\r
PrintAndLog("Target key type must be A or B");\r
return 1;\r
}\r
- if (ctmp != 'A' && ctmp != 'a') \r
+ if (ctmp != 'A' && ctmp != 'a')\r
trgKeyType = 1;\r
} else {\r
- \r
+\r
switch (cmdp) {\r
case '0': SectorsCnt = 05; break;\r
case '1': SectorsCnt = 16; break;\r
ctmp = param_getchar(Cmd, 4);\r
if (ctmp == 't' || ctmp == 'T') transferToEml = true;\r
else if (ctmp == 'd' || ctmp == 'D') createDumpFile = true;\r
- \r
+\r
ctmp = param_getchar(Cmd, 6);\r
transferToEml |= (ctmp == 't' || ctmp == 'T');\r
transferToEml |= (ctmp == 'd' || ctmp == 'D');\r
- \r
+\r
if (cmdp == 'o') {\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
sectortrailer = (trgBlockNo & 0x0f) + 15;\r
}\r
mfEmlGetMem(keyBlock, sectortrailer, 1);\r
- \r
+\r
if (!trgKeyType)\r
num_to_bytes(key64, 6, keyBlock);\r
else\r
num_to_bytes(key64, 6, &keyBlock[10]);\r
- mfEmlSetMem(keyBlock, sectortrailer, 1); \r
+ mfEmlSetMem(keyBlock, sectortrailer, 1);\r
}\r
} else {\r
PrintAndLog("No valid key found");\r
\r
e_sector = calloc(SectorsCnt, sizeof(sector_t));\r
if (e_sector == NULL) return 1;\r
- \r
+\r
//test current key and additional standard keys first\r
memcpy(keyBlock, key, 6);\r
num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 1 * 6));\r
for (i = 0; i < SectorsCnt; i++) {\r
for (j = 0; j < 2; j++) {\r
if (e_sector[i].foundKey[j]) continue;\r
- \r
+\r
res = mfCheckKeys(FirstBlockOfSector(i), j, true, 6, keyBlock, &key64);\r
- \r
+\r
if (!res) {\r
e_sector[i].Key[j] = key64;\r
e_sector[i].foundKey[j] = 1;\r
}\r
}\r
}\r
- \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 (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {\r
- for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { \r
+ for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) {\r
if (e_sector[sectorNo].foundKey[trgKeyType]) continue;\r
PrintAndLog("-----------------------------------------------");\r
int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate);\r
} else {\r
calibrate = false;\r
}\r
- \r
+\r
iterations++;\r
\r
key64 = bytes_to_num(keyBlock, 6);\r
}\r
\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
+\r
PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations);\r
//print them\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
- \r
+\r
// transfer them to the emulator\r
if (transferToEml) {\r
for (i = 0; i < SectorsCnt; i++) {\r
if (e_sector[i].foundKey[1])\r
num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]);\r
mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1);\r
- } \r
+ }\r
}\r
- \r
+\r
// Create dump file\r
if (createDumpFile) {\r
- if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { \r
+ if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) {\r
PrintAndLog("Could not create file dumpkeys.bin");\r
free(e_sector);\r
return 1;\r
}\r
fclose(fkeys);\r
}\r
- \r
+\r
free(e_sector);\r
}\r
return 0;\r
}\r
\r
+\r
+int CmdHF14AMfNestedHard(const char *Cmd)\r
+{\r
+ uint8_t blockNo = 0;\r
+ uint8_t keyType = 0;\r
+ uint8_t trgBlockNo = 0;\r
+ uint8_t trgKeyType = 0;\r
+ uint8_t key[6] = {0, 0, 0, 0, 0, 0};\r
+ uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0};\r
+\r
+ char ctmp;\r
+ ctmp = param_getchar(Cmd, 0);\r
+\r
+ if (ctmp != 'R' && ctmp != 'r' && ctmp != 'T' && ctmp != 't' && strlen(Cmd) < 20) {\r
+ PrintAndLog("Usage:");\r
+ PrintAndLog(" hf mf hardnested <block number> <key A|B> <key (12 hex symbols)>");\r
+ PrintAndLog(" <target block number> <target key A|B> [known target key (12 hex symbols)] [w] [s]");\r
+ PrintAndLog(" or hf mf hardnested r [known target key]");\r
+ PrintAndLog(" ");\r
+ PrintAndLog("Options: ");\r
+ PrintAndLog(" w: Acquire nonces and write them to binary file nonces.bin");\r
+ PrintAndLog(" s: Slower acquisition (required by some non standard cards)");\r
+ PrintAndLog(" r: Read nonces.bin and start attack");\r
+ PrintAndLog(" ");\r
+ PrintAndLog(" sample1: hf mf hardnested 0 A FFFFFFFFFFFF 4 A");\r
+ PrintAndLog(" sample2: hf mf hardnested 0 A FFFFFFFFFFFF 4 A w");\r
+ PrintAndLog(" sample3: hf mf hardnested 0 A FFFFFFFFFFFF 4 A w s");\r
+ PrintAndLog(" sample4: hf mf hardnested r");\r
+ PrintAndLog(" ");\r
+ PrintAndLog("Add the known target key to check if it is present in the remaining key space:");\r
+ PrintAndLog(" sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF");\r
+ return 0;\r
+ }\r
+\r
+ bool know_target_key = false;\r
+ bool nonce_file_read = false;\r
+ bool nonce_file_write = false;\r
+ bool slow = false;\r
+ int tests = 0;\r
+\r
+\r
+ if (ctmp == 'R' || ctmp == 'r') {\r
+ nonce_file_read = true;\r
+ if (!param_gethex(Cmd, 1, trgkey, 12)) {\r
+ know_target_key = true;\r
+ }\r
+ } else if (ctmp == 'T' || ctmp == 't') {\r
+ tests = param_get32ex(Cmd, 1, 100, 10);\r
+ if (!param_gethex(Cmd, 2, trgkey, 12)) {\r
+ know_target_key = true;\r
+ }\r
+ } else {\r
+ blockNo = param_get8(Cmd, 0);\r
+ ctmp = param_getchar(Cmd, 1);\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') {\r
+ keyType = 1;\r
+ }\r
+\r
+ if (param_gethex(Cmd, 2, key, 12)) {\r
+ PrintAndLog("Key must include 12 HEX symbols");\r
+ return 1;\r
+ }\r
+\r
+ trgBlockNo = param_get8(Cmd, 3);\r
+ ctmp = param_getchar(Cmd, 4);\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
+ if (ctmp != 'A' && ctmp != 'a') {\r
+ trgKeyType = 1;\r
+ }\r
+\r
+ uint16_t i = 5;\r
+\r
+ if (!param_gethex(Cmd, 5, trgkey, 12)) {\r
+ know_target_key = true;\r
+ i++;\r
+ }\r
+\r
+ while ((ctmp = param_getchar(Cmd, i))) {\r
+ if (ctmp == 's' || ctmp == 'S') {\r
+ slow = true;\r
+ } else if (ctmp == 'w' || ctmp == 'W') {\r
+ nonce_file_write = true;\r
+ } else {\r
+ PrintAndLog("Possible options are w and/or s");\r
+ return 1;\r
+ }\r
+ i++;\r
+ }\r
+ }\r
+\r
+ PrintAndLog("--target block no:%3d, target key type:%c, known target key: 0x%02x%02x%02x%02x%02x%02x%s, file action: %s, Slow: %s, Tests: %d ",\r
+ trgBlockNo,\r
+ trgKeyType?'B':'A',\r
+ trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5],\r
+ know_target_key?"":" (not set)",\r
+ nonce_file_write?"write":nonce_file_read?"read":"none",\r
+ slow?"Yes":"No",\r
+ tests);\r
+\r
+ int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow, tests);\r
+\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
+ default : break;\r
+ }\r
+ return 2;\r
+ }\r
+\r
+ return 0;\r
+}\r
+\r
+\r
int CmdHF14AMfChk(const char *Cmd)\r
{\r
if (strlen(Cmd)<3) {\r
PrintAndLog(" hf mf chk *1 ? t");\r
PrintAndLog(" hf mf chk *1 ? d");\r
return 0;\r
- } \r
+ }\r
\r
FILE * f;\r
char filename[FILE_PATH_SIZE]={0};\r
char buf[13];\r
uint8_t *keyBlock = NULL, *p;\r
- uint8_t stKeyBlock = 20;\r
- \r
+ uint16_t stKeyBlock = 20;\r
+\r
int i, res;\r
int keycnt = 0;\r
char ctmp = 0x00;\r
uint8_t SectorsCnt = 1;\r
uint8_t keyType = 0;\r
uint64_t key64 = 0;\r
- \r
+\r
int transferToEml = 0;\r
int createDumpFile = 0;\r
\r
{\r
num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6));\r
}\r
- \r
+\r
if (param_getchar(Cmd, 0)=='*') {\r
blockNo = 3;\r
switch(param_getchar(Cmd+1, 0)) {\r
}\r
else\r
blockNo = param_get8(Cmd, 0);\r
- \r
+\r
ctmp = param_getchar(Cmd, 1);\r
- switch (ctmp) { \r
+ switch (ctmp) {\r
case 'a': case 'A':\r
keyType = !0;\r
break;\r
break;\r
default:\r
PrintAndLog("Key type must be A , B or ?");\r
+ free(keyBlock);\r
return 1;\r
};\r
- \r
+\r
ctmp = param_getchar(Cmd, 2);\r
if (ctmp == 't' || ctmp == 'T') transferToEml = 1;\r
else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1;\r
- \r
+\r
for (i = transferToEml || createDumpFile; param_getchar(Cmd, 2 + i); i++) {\r
if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) {\r
if ( stKeyBlock - keycnt < 2) {\r
free(keyBlock);\r
return 2;\r
}\r
- \r
+\r
if ( (f = fopen( filename , "r")) ) {\r
while( fgets(buf, sizeof(buf), f) ){\r
if (strlen(buf) < 12 || buf[11] == '\n')\r
continue;\r
- \r
+\r
while (fgetc(f) != '\n' && !feof(f)) ; //goto next line\r
- \r
+\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
continue;\r
}\r
- \r
+\r
buf[12] = 0;\r
\r
if ( stKeyBlock - keycnt < 2) {\r
PrintAndLog("File: %s: not found or locked.", filename);\r
free(keyBlock);\r
return 1;\r
- \r
+\r
}\r
}\r
}\r
- \r
+\r
if (keycnt == 0) {\r
PrintAndLog("No key specified, trying default keys");\r
for (;keycnt < defaultKeysSize; 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
// initialize storage for found keys\r
bool validKey[2][40];\r
uint8_t foundKey[2][40][6];\r
}\r
}\r
}\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("Found valid key:[%012" PRIx64 "]",key64);\r
num_to_bytes(key64, 6, foundKey[t][i]);\r
validKey[t][i] = true;\r
- } \r
+ }\r
} else {\r
PrintAndLog("Command execute timeout");\r
}\r
}\r
- b<127?(b+=4):(b+=16); \r
+ b<127?(b+=4):(b+=16);\r
}\r
}\r
\r
\r
if (createDumpFile) {\r
FILE *fkeys = fopen("dumpkeys.bin","wb");\r
- if (fkeys == NULL) { \r
+ if (fkeys == NULL) {\r
PrintAndLog("Could not create file dumpkeys.bin");\r
free(keyBlock);\r
return 1;\r
}\r
\r
void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack) {\r
- #define ATTACK_KEY_COUNT 8 // keep same as define in iso14443a.c -> Mifare1ksim()\r
+ #define ATTACK_KEY_COUNT 7 // keep same as define in iso14443a.c -> Mifare1ksim()\r
+ // cannot be more than 7 or it will overrun c.d.asBytes(512)\r
uint64_t key = 0;\r
typedef struct {\r
uint64_t keyA;\r
PrintAndLog("block data must include 32 HEX symbols");\r
return;\r
}\r
- \r
+\r
UsbCommand c = {CMD_MIFARE_EML_MEMSET, {(stSector[i]*4+3), 1, 0}};\r
memcpy(c.d.asBytes, memBlock, 16);\r
clearCommandBuffer();\r
- SendCommand(&c); \r
+ SendCommand(&c);\r
}\r
}\r
}\r
PrintAndLog(" hf mf sim u 112233445566778899AA");\r
PrintAndLog(" hf mf sim f uids.txt");\r
PrintAndLog(" hf mf sim u 0a0a0a0a e");\r
- \r
+\r
return 0;\r
}\r
\r
memset(buf, 0, sizeof(buf));\r
memset(uid, 0, sizeof(uid));\r
\r
- if (fgets(buf, sizeof(buf), f) == NULL) { \r
+ if (fgets(buf, sizeof(buf), f) == NULL) {\r
if (count > 0) break;\r
- \r
+\r
PrintAndLog("File reading error.");\r
fclose(f);\r
return 2;\r
case 20: flags |= FLAG_10B_UID_IN_DATA; break; //not complete\r
case 14: flags |= FLAG_7B_UID_IN_DATA; break;\r
case 8: flags |= FLAG_4B_UID_IN_DATA; break;\r
- default: \r
+ default:\r
PrintAndLog("uid in file wrong length at %d (length: %d) [%s]",count, uidlen, buf);\r
fclose(f);\r
return 2;\r
for (uint8_t i = 0; i < uidlen; i += 2) {\r
sscanf(&buf[i], "%02x", (unsigned int *)&uid[i / 2]);\r
}\r
- \r
+\r
PrintAndLog("mf 1k sim uid: %s, numreads:%d, flags:%d (0x%02x) - press button to abort",\r
flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):\r
- flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): \r
+ flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7):\r
flags & FLAG_10B_UID_IN_DATA ? sprint_hex(uid,10): "N/A"\r
, exitAfterNReads, flags, flags);\r
\r
\r
PrintAndLog("mf 1k sim 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): \r
+ flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7):\r
flags & FLAG_10B_UID_IN_DATA ? sprint_hex(uid,10): "N/A"\r
, exitAfterNReads, flags, flags);\r
\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
\r
UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}};\r
SendCommand(&c);\r
PrintAndLog("Usage: hf mf eget <block number>");\r
PrintAndLog(" sample: hf mf eget 0 ");\r
return 0;\r
- } \r
- \r
+ }\r
+\r
blockNo = param_get8(Cmd, 0);\r
\r
PrintAndLog(" ");\r
PrintAndLog("Usage: hf mf eclr");\r
PrintAndLog("It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n");\r
return 0;\r
- } \r
+ }\r
\r
UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}};\r
SendCommand(&c);\r
PrintAndLog("Usage: hf mf eset <block number> <block data (32 hex symbols)>");\r
PrintAndLog(" sample: hf mf eset 1 000102030405060708090a0b0c0d0e0f ");\r
return 0;\r
- } \r
- \r
+ }\r
+\r
blockNo = param_get8(Cmd, 0);\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
+\r
// 1 - blocks count\r
UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNo, 1, 0}};\r
memcpy(c.d.asBytes, memBlock, 16);\r
uint8_t buf8[64] = {0x00};\r
int i, len, blockNum, numBlocks;\r
int nameParamNo = 1;\r
- \r
+\r
char ctmp = param_getchar(Cmd, 0);\r
- \r
+\r
if ( ctmp == 'h' || ctmp == 0x00) {\r
PrintAndLog("It loads emul dump from the file `filename.eml`");\r
PrintAndLog("Usage: hf mf eload [card memory] <file name w/o `.eml`>");\r
PrintAndLog(" sample: hf mf eload filename");\r
PrintAndLog(" hf mf eload 4 filename");\r
return 0;\r
- } \r
+ }\r
\r
switch (ctmp) {\r
case '0' : numBlocks = 5*4; break;\r
- case '1' : \r
+ case '1' :\r
case '\0': numBlocks = 16*4; break;\r
case '2' : numBlocks = 32*4; break;\r
case '4' : numBlocks = 256; break;\r
}\r
\r
len = param_getstr(Cmd,nameParamNo,filename);\r
- \r
+\r
if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
\r
fnameptr += len;\r
\r
- sprintf(fnameptr, ".eml"); \r
- \r
+ sprintf(fnameptr, ".eml");\r
+\r
// open file\r
f = fopen(filename, "r");\r
if (f == NULL) {\r
PrintAndLog("File %s not found or locked", filename);\r
return 1;\r
}\r
- \r
+\r
blockNum = 0;\r
while(!feof(f)){\r
memset(buf, 0, sizeof(buf));\r
- \r
+\r
if (fgets(buf, sizeof(buf), f) == NULL) {\r
- \r
+\r
if (blockNum >= numBlocks) break;\r
- \r
+\r
PrintAndLog("File reading error.");\r
fclose(f);\r
return 2;\r
}\r
- \r
+\r
if (strlen(buf) < 32){\r
if(strlen(buf) && feof(f))\r
break;\r
fclose(f);\r
return 2;\r
}\r
- \r
+\r
for (i = 0; i < 32; i += 2) {\r
sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]);\r
}\r
- \r
+\r
if (mfEmlSetMem(buf8, blockNum, 1)) {\r
PrintAndLog("Cant set emul block: %3d", blockNum);\r
fclose(f);\r
}\r
printf(".");\r
blockNum++;\r
- \r
+\r
if (blockNum >= numBlocks) break;\r
}\r
fclose(f);\r
printf("\n");\r
- \r
+\r
if ((blockNum != numBlocks)) {\r
PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks);\r
return 4;\r
uint8_t buf[64];\r
int i, j, len, numBlocks;\r
int nameParamNo = 1;\r
- \r
+\r
memset(filename, 0, sizeof(filename));\r
memset(buf, 0, sizeof(buf));\r
\r
char ctmp = param_getchar(Cmd, 0);\r
- \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 [card memory] [file name w/o `.eml`]");\r
PrintAndLog(" hf mf esave 4");\r
PrintAndLog(" hf mf esave 4 filename");\r
return 0;\r
- } \r
+ }\r
\r
switch (ctmp) {\r
case '0' : numBlocks = 5*4; break;\r
- case '1' : \r
+ case '1' :\r
case '\0': numBlocks = 16*4; break;\r
case '2' : numBlocks = 32*4; break;\r
case '4' : numBlocks = 256; break;\r
}\r
\r
len = param_getstr(Cmd,nameParamNo,filename);\r
- \r
+\r
if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
- \r
+\r
// user supplied filename?\r
if (len < 1) {\r
// get filename (UID from memory)\r
}\r
\r
// add file extension\r
- sprintf(fnameptr, ".eml"); \r
- \r
+ sprintf(fnameptr, ".eml");\r
+\r
// open file\r
f = fopen(filename, "w+");\r
\r
PrintAndLog("Can't open file %s ", filename);\r
return 1;\r
}\r
- \r
+\r
// put hex\r
for (i = 0; i < numBlocks; i++) {\r
if (mfEmlGetMem(buf, i, 1)) {\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
+\r
PrintAndLog("Saved %d blocks to file: %s", numBlocks, filename);\r
- \r
+\r
return 0;\r
}\r
\r
{\r
uint8_t keyType = 0;\r
uint8_t numSectors = 16;\r
- \r
+\r
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\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("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
\r
char ctmp = param_getchar(Cmd, 0);\r
if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') {\r
ctmp = param_getchar(Cmd, 1);\r
switch (ctmp) {\r
case '0' : numSectors = 5; break;\r
- case '1' : \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
\r
printf("--params: numSectors: %d, keyType:%d", numSectors, keyType);\r
UsbCommand c = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}};\r
return 0;\r
}\r
\r
-\r
int CmdHF14AMfEKeyPrn(const char *Cmd)\r
{\r
int i;\r
uint8_t numSectors;\r
uint8_t data[16];\r
uint64_t keyA, keyB;\r
- \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("");\r
PrintAndLog(" sample: hf mf ekeyprn 1");\r
return 0;\r
- } \r
+ }\r
\r
char cmdp = param_getchar(Cmd, 0);\r
- \r
+\r
switch (cmdp) {\r
case '0' : numSectors = 5; break;\r
- case '1' : \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
+ }\r
+\r
PrintAndLog("|---|----------------|----------------|");\r
PrintAndLog("|sec|key A |key B |");\r
PrintAndLog("|---|----------------|----------------|");\r
PrintAndLog("|%03d| %012" PRIx64 " | %012" PRIx64 " |", i, keyA, keyB);\r
}\r
PrintAndLog("|---|----------------|----------------|");\r
- \r
+\r
return 0;\r
}\r
\r
-\r
int CmdHF14AMfCSetUID(const char *Cmd)\r
{\r
uint8_t wipeCard = 0;\r
PrintAndLog("Can't set UID. error=%d", res);\r
return 1;\r
}\r
- \r
+\r
PrintAndLog("old UID:%s", sprint_hex(oldUid, 4));\r
PrintAndLog("new UID:%s", sprint_hex(uid, 4));\r
return 0;\r
uint8_t memBlock[16] = {0x00};\r
uint8_t blockNo = 0;\r
bool wipeCard = false;\r
- int res;\r
+ int res, gen = 0;\r
\r
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
PrintAndLog("Usage: hf mf csetblk <block number> <block data (32 hex symbols)> [w]");\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
+\r
+ gen = mfCIdentify();\r
\r
blockNo = param_get8(Cmd, 0);\r
\r
wipeCard = (ctmp == 'w' || ctmp == 'W');\r
PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16));\r
\r
- res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER);\r
+ if (gen == 2) {\r
+ /* generation 1b magic card */\r
+ res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B);\r
+ } else {\r
+ /* generation 1a magic card by default */\r
+ res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER);\r
+ }\r
+\r
if (res) {\r
PrintAndLog("Can't write block. error=%d", res);\r
return 1;\r
FILE * f;\r
char filename[FILE_PATH_SIZE] = {0x00};\r
char * fnameptr = filename;\r
- char buf[64] = {0x00};\r
- uint8_t buf8[64] = {0x00};\r
+ char buf[256] = {0x00};\r
+ uint8_t buf8[256] = {0x00};\r
uint8_t fillFromEmulator = 0;\r
- int i, len, blockNum, flags=0;\r
- \r
+ int i, len, blockNum, flags = 0, gen = 0, numblock = 64;\r
+\r
if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) {\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(" sample: hf mf cload filename");\r
+ PrintAndLog("or from emulator memory (option `e`). 4K card: (option `4`)");\r
+ PrintAndLog("Usage: hf mf cload [file name w/o `.eml`][e][4]");\r
+ PrintAndLog(" or: hf mf cload e [4]");\r
+ PrintAndLog("Sample: hf mf cload filename");\r
+ PrintAndLog(" hf mf cload filname 4");\r
+ PrintAndLog(" hf mf cload e");\r
+ PrintAndLog(" hf mf cload e 4");\r
return 0;\r
- } \r
+ }\r
\r
char ctmp = param_getchar(Cmd, 0);\r
if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
- \r
+ ctmp = param_getchar(Cmd, 1);\r
+ if (ctmp == '4') numblock = 256;\r
+\r
+ gen = mfCIdentify();\r
+ PrintAndLog("Loading magic mifare %dK", numblock == 256 ? 4:1);\r
+\r
if (fillFromEmulator) {\r
- for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) {\r
+ for (blockNum = 0; blockNum < numblock; blockNum += 1) {\r
if (mfEmlGetMem(buf8, blockNum, 1)) {\r
PrintAndLog("Cant get block: %d", blockNum);\r
return 2;\r
}\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
+ if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field.\r
\r
+ if (gen == 2)\r
+ /* generation 1b magic card */\r
+ flags |= CSETBLOCK_MAGIC_1B;\r
if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) {\r
PrintAndLog("Cant set magic card block: %d", blockNum);\r
return 3;\r
}\r
return 0;\r
} else {\r
- len = strlen(Cmd);\r
+ param_getstr(Cmd, 0, filename);\r
+\r
+ len = strlen(filename);\r
if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
\r
- memcpy(filename, Cmd, len);\r
+ //memcpy(filename, Cmd, len);\r
fnameptr += len;\r
\r
- sprintf(fnameptr, ".eml"); \r
- \r
+ sprintf(fnameptr, ".eml");\r
+\r
// open file\r
f = fopen(filename, "r");\r
if (f == NULL) {\r
PrintAndLog("File not found or locked.");\r
return 1;\r
}\r
- \r
+\r
blockNum = 0;\r
while(!feof(f)){\r
- \r
+\r
memset(buf, 0, sizeof(buf));\r
- \r
+\r
if (fgets(buf, sizeof(buf), f) == NULL) {\r
fclose(f);\r
PrintAndLog("File reading error.");\r
\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
+ if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field.\r
\r
+ if (gen == 2)\r
+ /* generation 1b magic card */\r
+ flags |= CSETBLOCK_MAGIC_1B;\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
- \r
- if (blockNum >= 16 * 4) break; // magic card type - mifare 1K\r
+\r
+ if (blockNum >= numblock) break; // magic card type - mifare 1K 64 blocks, mifare 4k 256 blocks\r
}\r
fclose(f);\r
- \r
- if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){\r
- PrintAndLog("File content error. There must be 64 blocks");\r
+\r
+ //if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){\r
+ if (blockNum != numblock){\r
+ PrintAndLog("File content error. There must be %d blocks", numblock);\r
return 4;\r
}\r
PrintAndLog("Loaded from file: %s", filename);\r
int CmdHF14AMfCGetBlk(const char *Cmd) {\r
uint8_t memBlock[16];\r
uint8_t blockNo = 0;\r
- int res;\r
+ int res, gen = 0;\r
memset(memBlock, 0x00, sizeof(memBlock));\r
\r
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
PrintAndLog("sample: hf mf cgetblk 1");\r
PrintAndLog("Get block data from magic Chinese card (only works with such cards)\n");\r
return 0;\r
- } \r
+ }\r
+\r
+ gen = mfCIdentify();\r
\r
blockNo = param_get8(Cmd, 0);\r
\r
PrintAndLog("--block number:%2d ", blockNo);\r
\r
- res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER);\r
+ if (gen == 2) {\r
+ /* generation 1b magic card */\r
+ res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B);\r
+ } else {\r
+ /* generation 1a magic card by default */\r
+ res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER);\r
+ }\r
if (res) {\r
PrintAndLog("Can't read block. error=%d", res);\r
return 1;\r
}\r
- \r
+\r
PrintAndLog("block data:%s", sprint_hex(memBlock, 16));\r
return 0;\r
}\r
\r
-\r
int CmdHF14AMfCGetSc(const char *Cmd) {\r
uint8_t memBlock[16] = {0x00};\r
uint8_t sectorNo = 0;\r
- int i, res, flags;\r
+ int i, res, flags, gen = 0, baseblock = 0, sect_size = 4;\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 such cards)\n");\r
return 0;\r
- } \r
+ }\r
\r
sectorNo = param_get8(Cmd, 0);\r
- if (sectorNo > 15) {\r
- PrintAndLog("Sector number must be in [0..15] as in MIFARE classic.");\r
+\r
+ if (sectorNo > 39) {\r
+ PrintAndLog("Sector number must be in [0..15] in MIFARE classic 1k and [0..39] in MIFARE classic 4k.");\r
return 1;\r
}\r
\r
PrintAndLog("--sector number:%d ", sectorNo);\r
\r
+ gen = mfCIdentify();\r
+\r
flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
- for (i = 0; i < 4; i++) {\r
+ if (sectorNo < 32 ) {\r
+ baseblock = sectorNo * 4;\r
+ } else {\r
+ baseblock = 128 + 16 * (sectorNo - 32);\r
+\r
+ }\r
+ if (sectorNo > 31) sect_size = 16;\r
+\r
+ for (i = 0; i < sect_size; i++) {\r
if (i == 1) flags = 0;\r
- if (i == 3) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+ if (i == sect_size - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
\r
- res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags);\r
+ if (gen == 2)\r
+ /* generation 1b magic card */\r
+ flags |= CSETBLOCK_MAGIC_1B;\r
+\r
+ res = mfCGetBlock(baseblock + i, memBlock, flags);\r
if (res) {\r
- PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res);\r
+ PrintAndLog("Can't read block. %d error=%d", baseblock + i, res);\r
return 1;\r
}\r
- \r
- PrintAndLog("block %3d data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16));\r
+\r
+ PrintAndLog("block %3d data:%s", baseblock + i, sprint_hex(memBlock, 16));\r
}\r
return 0;\r
}\r
char filename[FILE_PATH_SIZE] = {0x00};\r
char * fnameptr = filename;\r
uint8_t fillFromEmulator = 0;\r
- uint8_t buf[64] = {0x00};\r
- int i, j, len, flags;\r
- \r
+ uint8_t buf[256] = {0x00};\r
+ int i, j, len, flags, gen = 0, numblock = 64;\r
+\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
- PrintAndLog("or into emulator memory (option `e`)");\r
- PrintAndLog("Usage: hf mf esave [file name w/o `.eml`][e]");\r
- PrintAndLog(" sample: hf mf esave ");\r
- PrintAndLog(" hf mf esave filename");\r
- PrintAndLog(" hf mf esave e \n");\r
+ PrintAndLog("or into emulator memory (option `e`). 4K card: (option `4`)");\r
+ PrintAndLog("Usage: hf mf esave [file name w/o `.eml`][e][4]");\r
+ PrintAndLog("Sample: hf mf esave ");\r
+ PrintAndLog(" hf mf esave filename");\r
+ PrintAndLog(" hf mf esave e");\r
+ PrintAndLog(" hf mf esave 4");\r
+ PrintAndLog(" hf mf esave filename 4");\r
+ PrintAndLog(" hf mf esave e 4");\r
return 0;\r
- } \r
+ }\r
\r
char ctmp = param_getchar(Cmd, 0);\r
if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1;\r
+ if (ctmp == '4') numblock = 256;\r
+ ctmp = param_getchar(Cmd, 1);\r
+ if (ctmp == '4') numblock = 256;\r
+\r
+ gen = mfCIdentify();\r
+ PrintAndLog("Saving magic mifare %dK", numblock == 256 ? 4:1);\r
\r
if (fillFromEmulator) {\r
// put into emulator\r
flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
- for (i = 0; i < 16 * 4; i++) {\r
+ for (i = 0; i < numblock; i++) {\r
if (i == 1) flags = 0;\r
- if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
- \r
+ if (i == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+\r
+ if (gen == 2)\r
+ /* generation 1b magic card */\r
+ flags |= CSETBLOCK_MAGIC_1B;\r
+\r
if (mfCGetBlock(i, buf, flags)) {\r
PrintAndLog("Cant get block: %d", i);\r
break;\r
}\r
- \r
+\r
if (mfEmlSetMem(buf, i, 1)) {\r
PrintAndLog("Cant set emul block: %d", i);\r
return 3;\r
}\r
return 0;\r
} else {\r
- len = strlen(Cmd);\r
+ param_getstr(Cmd, 0, filename);\r
+\r
+ len = strlen(filename);\r
if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5;\r
- \r
- if (len < 1) {\r
+\r
+ ctmp = param_getchar(Cmd, 0);\r
+ if (len < 1 || (ctmp == '4')) {\r
// get filename\r
- if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) {\r
+\r
+ flags = CSETBLOCK_SINGLE_OPER;\r
+ if (gen == 2)\r
+ /* generation 1b magic card */\r
+ flags |= CSETBLOCK_MAGIC_1B;\r
+ if (mfCGetBlock(0, buf, flags)) {\r
PrintAndLog("Cant get 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
+ sprintf(fnameptr, "%02x", buf[j]);\r
}\r
} else {\r
- memcpy(filename, Cmd, len);\r
+ //memcpy(filename, Cmd, len);\r
fnameptr += len;\r
}\r
\r
- sprintf(fnameptr, ".eml"); \r
- \r
+ sprintf(fnameptr, ".eml");\r
+\r
// open file\r
f = fopen(filename, "w+");\r
\r
\r
// put hex\r
flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC;\r
- for (i = 0; i < 16 * 4; i++) {\r
+ for (i = 0; i < numblock; i++) {\r
if (i == 1) flags = 0;\r
- if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
- \r
+ if (i == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD;\r
+\r
+ if (gen == 2)\r
+ /* generation 1b magic card */\r
+ flags |= CSETBLOCK_MAGIC_1B;\r
if (mfCGetBlock(i, buf, flags)) {\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
+\r
PrintAndLog("Saved to file: %s", filename);\r
- \r
+\r
return 0;\r
}\r
}\r
//bool wantSaveToEml = 0; TODO\r
bool wantSaveToEmlFile = 0;\r
\r
- //var \r
+ //var\r
int res = 0;\r
int len = 0;\r
int blockLen = 0;\r
uint8_t *buf = NULL;\r
uint16_t bufsize = 0;\r
uint8_t *bufPtr = NULL;\r
- \r
+\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("Usage: hf mf sniff [l][d][e][f]");\r
PrintAndLog(" sample: hf mf sniff l d e");\r
return 0;\r
- } \r
- \r
+ }\r
+\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 == 'e' || ctmp == 'E') wantSaveToEml = true; TODO\r
if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true;\r
}\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("\naborted via keyboard!\n");\r
break;\r
}\r
- \r
+\r
UsbCommand resp;\r
if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) {\r
res = resp.arg[0] & 0xff;\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
+ 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
+ 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
+ }\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
+ if (wantLogToFile)\r
AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len);\r
- if (wantDecrypt) \r
+ if (wantDecrypt)\r
mfTraceDecode(bufPtr, len, wantSaveToEmlFile);\r
- num++; \r
+ num++;\r
}\r
bufPtr += len;\r
bufPtr += ((len-1)/8+1); // ignore parity\r
\r
static command_t CommandTable[] =\r
{\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
- {"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."},\r
- {"nested", CmdHF14AMfNested, 0, "Test nested authentication"},\r
- {"sniff", CmdHF14AMfSniff, 0, "Sniff card-reader communication"},\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
- {"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
- {"decrypt", CmdDecryptTraceCmds,1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"},\r
- {NULL, NULL, 0, NULL}\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
+ {"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."},\r
+ {"hardnested", CmdHF14AMfNestedHard, 0, "Nested attack for hardened Mifare cards"},\r
+ {"nested", CmdHF14AMfNested, 0, "Test nested authentication"},\r
+ {"sniff", CmdHF14AMfSniff, 0, "Sniff card-reader communication"},\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
+ {"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
+ {"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
projects / proxmark3-svn / blobdiff