\r
static int CmdHelp(const char *Cmd);\r
\r
-\r
int CmdHF14AMifare(const char *Cmd)\r
{\r
uint32_t uid = 0;\r
uint64_t par_list = 0, ks_list = 0, r_key = 0;\r
uint8_t isOK = 0;\r
uint8_t keyBlock[6] = {0,0,0,0,0,0};\r
- \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
+\r
\r
UsbCommand c = {CMD_READER_MIFARE, {(uint32_t)bytes_to_num(keyBlock, 4), 0, 0}};\r
+start:\r
SendCommand(&c);\r
\r
//flush queue\r
// wait cycle\r
while (true) {\r
printf(".");\r
+ fflush(stdout);\r
if (ukbhit()) {\r
getchar();\r
printf("\naborted via keyboard!\n");\r
if (!isOK) \r
PrintAndLog("Found valid key:%012llx", r_key);\r
else\r
- PrintAndLog("Found invalid key. ( Nt=%08x", nt); \r
- \r
+ {\r
+ PrintAndLog("Found invalid key. ( Nt=%08x ,Trying use it to run again...", nt); \r
+ c.d.asDwords[0] = nt;\r
+ goto start;\r
+ }\r
\r
return 0;\r
}\r
return 0;\r
}\r
\r
+int CmdHF14AMfDump(const char *Cmd)\r
+{\r
+ int i, j;\r
+ \r
+ uint8_t keyA[40][6];\r
+ uint8_t keyB[40][6];\r
+ uint8_t rights[40][4];\r
+ \r
+ FILE *fin;\r
+ FILE *fout;\r
+ \r
+ UsbCommand *resp;\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
+ }\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
+ }\r
+ \r
+ // Read access rights to sectors\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
+ 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 (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
+ }\r
+ }\r
+ else {\r
+ PrintAndLog("Command execute timeout");\r
+ }\r
+ }\r
+ \r
+ // Read blocks and print to file\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
+ 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
+ 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
+ SendCommand(&c);\r
+ resp = WaitForResponseTimeout(CMD_ACK, 1500);\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
+ }\r
+ if (isOK) {\r
+ fwrite ( data, 1, 16, fout );\r
+ }\r
+ else {\r
+ PrintAndLog("Could not get access rights for block %d", i);\r
+ }\r
+ }\r
+ else {\r
+ PrintAndLog("Command execute timeout");\r
+ }\r
+ }\r
+ }\r
+ \r
+ fclose(fin);\r
+ fclose(fout);\r
+ \r
+ return 0;\r
+}\r
+\r
+int CmdHF14AMfRestore(const char *Cmd)\r
+{\r
+\r
+ int i,j;\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
+ \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
+ 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
+ }\r
+ for (i=0 ; i<16 ; i++) {\r
+ fread(keyB[i], 1, 6, fkeys);\r
+ }\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
+ memcpy(c.d.asBytes, key, 6);\r
+ \r
+ fread(bldata, 1, 16, fdump);\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
+ } \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
+ \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
+ PrintAndLog("isOk:%02x", isOK);\r
+ } else {\r
+ PrintAndLog("Command execute timeout");\r
+ }\r
+ }\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
uint64_t key64 = 0;\r
int transferToEml = 0;\r
\r
+ int createDumpFile = 0;\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
char cmdp, ctmp;\r
\r
if (strlen(Cmd)<3) {\r
PrintAndLog("Usage:");\r
- PrintAndLog(" all sectors: hf mf nested <card memory> <block number> <key A/B> <key (12 hex symbols)> [t]");\r
+ PrintAndLog(" all sectors: hf mf nested <card memory> <block number> <key A/B> <key (12 hex symbols)> [t,d]");\r
PrintAndLog(" one sector: hf mf nested o <block number> <key A/B> <key (12 hex symbols)>");\r
PrintAndLog(" <target block number> <target key A/B> [t]");\r
PrintAndLog("card memory - 0 - MINI(320 bytes), 1 - 1K, 2 - 2K, 4 - 4K, <other> - 1K");\r
PrintAndLog("t - transfer keys into emulator memory");\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
return 0;\r
} \r
}\r
\r
ctmp = param_getchar(Cmd, 4);\r
- if (ctmp == 't' || ctmp == 'T') transferToEml = 1;\r
+ if (ctmp == 't' || ctmp == 'T') transferToEml = 1;\r
+ else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1;\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
}\r
\r
for (i = 0; i < 16; i++) {\r
- PrintAndLog("cnt=%d key= %s", i, sprint_hex(keyBlock + i * 6, 6));\r
+ PrintAndLog("count=%d key= %s", i, sprint_hex(keyBlock + i * 6, 6));\r
}\r
\r
// test keys\r
} else {\r
PrintAndLog("No valid key found");\r
}\r
- } else // ------------------------------------ multiple sectors working\r
- {\r
+ }\r
+ else { // ------------------------------------ multiple sectors working\r
blDiff = blockNo % 4;\r
PrintAndLog("Block shift=%d", blDiff);\r
e_sector = calloc(SectorsCnt, sizeof(sector));\r
}\r
} \r
\r
- \r
// nested sectors\r
iterations = 0;\r
PrintAndLog("nested...");\r
} \r
}\r
\r
+ // Create dump file\r
+ if (createDumpFile) {\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
+ 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
+ }\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
+ }\r
+ fclose(fkeys);\r
+ }\r
+ \r
free(e_sector);\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
+ FILE * f;\r
+ char filename[256]={0};\r
+ char buf[13];\r
+ uint8_t *keyBlock = NULL, *p;\r
+ uint8_t stKeyBlock = 20;\r
+ \r
int i, res;\r
int keycnt = 0;\r
char ctmp = 0x00;\r
uint8_t blockNo = 0;\r
+ uint8_t SectorsCnt = 1;\r
uint8_t keyType = 0;\r
- uint8_t keyBlock[8 * 6];\r
uint64_t key64 = 0;\r
-\r
- memset(keyBlock, 0x00, sizeof(keyBlock));\r
-\r
+ \r
+ int transferToEml = 0;\r
+ int createDumpFile = 0;\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> <key A/B> [<key (12 hex symbols)>]");\r
- PrintAndLog(" sample: hf mf chk 0 A FFFFFFFFFFFF a0a1a2a3a4a5 b0b1b2b3b4b5 ");\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
\r
- blockNo = param_get8(Cmd, 0);\r
+ if (param_getchar(Cmd, 0)=='*') {\r
+ blockNo = 3;\r
+ switch(param_getchar(Cmd+1, 0)) {\r
+ case '0': SectorsCnt = 5; break;\r
+ case '1': SectorsCnt = 16; break;\r
+ case '2': SectorsCnt = 32; break;\r
+ case '4': SectorsCnt = 40; break;\r
+ default: SectorsCnt = 16;\r
+ }\r
+ }\r
+ else\r
+ blockNo = param_get8(Cmd, 0);\r
+ \r
ctmp = param_getchar(Cmd, 1);\r
- if (ctmp == 0x00) {\r
- PrintAndLog("Key type must be A or B");\r
+ switch (ctmp) { \r
+ case 'a': case 'A':\r
+ keyType = !0;\r
+ break;\r
+ case 'b': case 'B':\r
+ keyType = !1;\r
+ break;\r
+ case '?':\r
+ keyType = 2;\r
+ break;\r
+ default:\r
+ PrintAndLog("Key type must be A , B or ?");\r
return 1;\r
- }\r
- if (ctmp != 'A' && ctmp != 'a') keyType = 1;\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
- for (i = 0; i < 6; i++) {\r
- if (!isxdigit(param_getchar(Cmd, 2 + i))) break;\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
+ p = realloc(keyBlock, 6*(stKeyBlock+=10));\r
+ if (!p) {\r
+ PrintAndLog("Cannot allocate memory for Keys");\r
+ free(keyBlock);\r
+ return 2;\r
+ }\r
+ keyBlock = p;\r
+ }\r
+ PrintAndLog("chk 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
+ keycnt++;\r
+ } else {\r
+ // May be a dic file\r
+ if ( param_getstr(Cmd, 2 + i,filename) > 255 ) {\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
+ 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
\r
- if (param_gethex(Cmd, 2 + i, keyBlock + 6 * i, 12)) {\r
- PrintAndLog("Key[%d] must include 12 HEX symbols", i);\r
- return 1;\r
+ if (!isxdigit(buf[0])){\r
+ PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);\r
+ continue;\r
+ }\r
+ \r
+ buf[12] = 0;\r
+\r
+ if ( stKeyBlock - keycnt < 2) {\r
+ p = realloc(keyBlock, 6*(stKeyBlock+=10));\r
+ if (!p) {\r
+ PrintAndLog("Cannot allocate memory for defKeys");\r
+ free(keyBlock);\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[%d] %012llx", keycnt, bytes_to_num(keyBlock + 6*keycnt, 6));\r
+ keycnt++;\r
+ }\r
+ } else {\r
+ PrintAndLog("File: %s: not found or locked.", filename);\r
+ free(keyBlock);\r
+ return 1;\r
+ fclose(f);\r
+ }\r
}\r
- keycnt = i + 1;\r
}\r
\r
if (keycnt == 0) {\r
- PrintAndLog("There is must be at least one key");\r
- return 1;\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
}\r
-\r
- PrintAndLog("--block no:%02x key type:%02x key count:%d ", blockNo, keyType, keycnt);\r
\r
- res = mfCheckKeys(blockNo, keyType, keycnt, keyBlock, &key64);\r
- if (res !=1) {\r
- if (!res)\r
- PrintAndLog("isOk:%02x valid key:%012llx", 1, key64);\r
- else\r
- PrintAndLog("isOk:%02x", 0);\r
- } else {\r
- PrintAndLog("Command execute timeout");\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
+ 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
+ } else {\r
+ PrintAndLog("Command execute timeout");\r
+ }\r
+ }\r
+ b<127?(b+=4):(b+=16); \r
+ }\r
}\r
-\r
+ \r
+ free(keyBlock);\r
+\r
+/*\r
+ // Create dump file\r
+ if (createDumpFile) {\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
+ 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
+ }\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
+ }\r
+ fclose(fkeys);\r
+ }\r
+*/\r
return 0;\r
}\r
\r
} \r
\r
blockNo = param_get8(Cmd, 0);\r
- if (blockNo >= 16 * 4) {\r
- PrintAndLog("Block number must be in [0..63] as in MIFARE classic.");\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
} \r
\r
blockNo = param_get8(Cmd, 0);\r
- if (blockNo >= 16 * 4) {\r
- PrintAndLog("Block number must be in [0..63] as in MIFARE classic.");\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
memset(filename, 0, sizeof(filename));\r
memset(buf, 0, sizeof(buf));\r
\r
- if (param_getchar(Cmd, 0) == 'h') {\r
+ if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 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(" sample: hf mf eload filename");\r
\r
len = strlen(Cmd);\r
if (len > 14) len = 14;\r
- \r
- if (len < 1) {\r
- }\r
\r
memcpy(filename, Cmd, len);\r
fnameptr += len;\r
while(!feof(f)){\r
memset(buf, 0, sizeof(buf));\r
fgets(buf, sizeof(buf), f);\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
return 2;\r
}\r
}\r
blockNum++;\r
\r
- if (blockNum >= 16 * 4) break;\r
+ if (blockNum >= 32 * 4 + 8 * 16) break;\r
}\r
fclose(f);\r
\r
- if (blockNum != 16 * 4){\r
+ if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){\r
PrintAndLog("File content error. There must be 64 blocks");\r
return 4;\r
}\r
f = fopen(filename, "w+");\r
\r
// put hex\r
- for (i = 0; i < 16 * 4; i++) {\r
+ for (i = 0; i < 32 * 4 + 8 * 16; i++) {\r
if (mfEmlGetMem(buf, i, 1)) {\r
PrintAndLog("Cant get block: %d", i);\r
break;\r
return 0;\r
}\r
\r
-int CmdHF14AMfECFill(const char *Cmd) {\r
+int CmdHF14AMfECFill(const char *Cmd)\r
+{\r
uint8_t keyType = 0;\r
\r
if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') {\r
return 0;\r
}\r
\r
-int CmdHF14AMfEKeyPrn(const char *Cmd) {\r
- int i;\r
+int CmdHF14AMfEKeyPrn(const char *Cmd)\r
+{\r
+ int i,b=-1;\r
uint8_t data[16];\r
uint64_t keyA, keyB;\r
\r
PrintAndLog("|---|----------------|----------------|");\r
PrintAndLog("|sec|key A |key B |");\r
PrintAndLog("|---|----------------|----------------|");\r
- for (i = 0; i < 16; i++) {\r
- if (mfEmlGetMem(data, i * 4 + 3, 1)) {\r
- PrintAndLog("error get block %d", i * 4 + 3);\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
break;\r
}\r
keyA = bytes_to_num(data, 6);\r
return 0;\r
}\r
\r
-static command_t CommandTable[] = \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
+ {"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 up to 8 keys"},\r
+ {"chk", CmdHF14AMfChk, 0, "Test block keys"},\r
{"mifare", CmdHF14AMifare, 0, "Read parity error messages. param - <used card nonce>"},\r
{"nested", CmdHF14AMfNested, 0, "Test nested authentication"},\r
- {"sim", CmdHF14AMf1kSim, 0, "Simulate MIFARE 1k 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
projects / proxmark3-svn / blobdiff