X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/40c6a02bc9b602885f2887c023e17a8559cc733c..5191ad9e556e4209945ccce8122a96d87c1e92d9:/client/cmdhfmf.c diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index d5ce118b..aafbce2a 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -8,104 +8,62 @@ // High frequency MIFARE commands //----------------------------------------------------------------------------- -#include #include "cmdhfmf.h" -#include "./nonce2key/nonce2key.h" + +#include +#include +#include +#include +#include +#include "proxmark3.h" +#include "cmdmain.h" +#include "cmdhfmfhard.h" +#include "util.h" +#include "util_posix.h" +#include "usb_cmd.h" +#include "ui.h" +#include "mifarehost.h" +#include "mifare.h" +#include "mfkey.h" + +#define NESTED_SECTOR_RETRY 10 // how often we try mfested() until we give up static int CmdHelp(const char *Cmd); int CmdHF14AMifare(const char *Cmd) { - uint32_t uid = 0; - uint32_t nt = 0, nr = 0; - uint64_t par_list = 0, ks_list = 0, r_key = 0; - int16_t isOK = 0; - - UsbCommand c = {CMD_READER_MIFARE, {true, 0, 0}}; - - // message - printf("-------------------------------------------------------------------------\n"); - printf("Executing command. Expected execution time: 25sec on average :-)\n"); - printf("Press button on the proxmark3 device to abort both proxmark3 and client.\n"); - printf("-------------------------------------------------------------------------\n"); - - - start: - clearCommandBuffer(); - SendCommand(&c); - - //flush queue - while (ukbhit()) { - int c = getchar(); (void) c; + int isOK = 0; + uint64_t key = 0; + isOK = mfDarkside(&key); + switch (isOK) { + case -1 : PrintAndLog("Button pressed. Aborted."); return 1; + case -2 : PrintAndLog("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests)."); return 1; + case -3 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator is not predictable)."); return 1; + case -4 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown"); + PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour."); return 1; + case -5 : PrintAndLog("Aborted via keyboard."); return 1; + default : PrintAndLog("Found valid key:%012" PRIx64 "\n", key); } - - // wait cycle - while (true) { - printf("."); - fflush(stdout); - if (ukbhit()) { - getchar(); - printf("\naborted via keyboard!\n"); - break; - } - - UsbCommand resp; - if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) { - isOK = resp.arg[0]; - uid = (uint32_t)bytes_to_num(resp.d.asBytes + 0, 4); - nt = (uint32_t)bytes_to_num(resp.d.asBytes + 4, 4); - par_list = bytes_to_num(resp.d.asBytes + 8, 8); - ks_list = bytes_to_num(resp.d.asBytes + 16, 8); - nr = bytes_to_num(resp.d.asBytes + 24, 4); - printf("\n\n"); - switch (isOK) { - case -1 : PrintAndLog("Button pressed. Aborted.\n"); break; - case -2 : PrintAndLog("Card is not vulnerable to Darkside attack (doesn't send NACK on authentication requests).\n"); break; - case -3 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator is not predictable).\n"); break; - case -4 : PrintAndLog("Card is not vulnerable to Darkside attack (its random number generator seems to be based on the wellknown"); - PrintAndLog("generating polynomial with 16 effective bits only, but shows unexpected behaviour.\n"); break; - default: ; - } - break; - } - } - printf("\n"); - - // error - if (isOK != 1) return 1; - - // execute original function from util nonce2key - if (nonce2key(uid, nt, nr, par_list, ks_list, &r_key)) { - isOK = 2; - PrintAndLog("Key not found (lfsr_common_prefix list is null). Nt=%08x", nt); - PrintAndLog("Failing is expected to happen in 25%% of all cases. Trying again with a different reader nonce..."); - c.arg[0] = false; - goto start; - } else { - isOK = 0; - printf("------------------------------------------------------------------\n"); - PrintAndLog("Found valid key:%012" PRIx64 " \n", r_key); - } - PrintAndLog(""); return 0; } + int CmdHF14AMfWrBl(const char *Cmd) { uint8_t blockNo = 0; uint8_t keyType = 0; uint8_t key[6] = {0, 0, 0, 0, 0, 0}; uint8_t bldata[16] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; - + char cmdp = 0x00; if (strlen(Cmd)<3) { PrintAndLog("Usage: hf mf wrbl "); PrintAndLog(" sample: hf mf wrbl 0 A FFFFFFFFFFFF 000102030405060708090A0B0C0D0E0F"); return 0; - } + } blockNo = param_get8(Cmd, 0); cmdp = param_getchar(Cmd, 1); @@ -124,7 +82,7 @@ int CmdHF14AMfWrBl(const char *Cmd) } PrintAndLog("--block no:%d, key type:%c, key:%s", blockNo, keyType?'B':'A', sprint_hex(key, 6)); PrintAndLog("--data: %s", sprint_hex(bldata, 16)); - + UsbCommand c = {CMD_MIFARE_WRITEBL, {blockNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); memcpy(c.d.asBytes + 10, bldata, 16); @@ -146,7 +104,7 @@ int CmdHF14AMfRdBl(const char *Cmd) uint8_t blockNo = 0; uint8_t keyType = 0; uint8_t key[6] = {0, 0, 0, 0, 0, 0}; - + char cmdp = 0x00; @@ -154,8 +112,8 @@ int CmdHF14AMfRdBl(const char *Cmd) PrintAndLog("Usage: hf mf rdbl "); PrintAndLog(" sample: hf mf rdbl 0 A FFFFFFFFFFFF "); return 0; - } - + } + blockNo = param_get8(Cmd, 0); cmdp = param_getchar(Cmd, 1); if (cmdp == 0x00) { @@ -168,7 +126,7 @@ int CmdHF14AMfRdBl(const char *Cmd) return 1; } PrintAndLog("--block no:%d, key type:%c, key:%s ", blockNo, keyType?'B':'A', sprint_hex(key, 6)); - + UsbCommand c = {CMD_MIFARE_READBL, {blockNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); SendCommand(&c); @@ -203,8 +161,8 @@ int CmdHF14AMfRdSc(const char *Cmd) PrintAndLog("Usage: hf mf rdsc "); PrintAndLog(" sample: hf mf rdsc 0 A FFFFFFFFFFFF "); return 0; - } - + } + sectorNo = param_get8(Cmd, 0); if (sectorNo > 39) { PrintAndLog("Sector number must be less than 40"); @@ -221,7 +179,7 @@ int CmdHF14AMfRdSc(const char *Cmd) return 1; } PrintAndLog("--sector no:%d key type:%c key:%s ", sectorNo, keyType?'B':'A', sprint_hex(key, 6)); - + UsbCommand c = {CMD_MIFARE_READSC, {sectorNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); SendCommand(&c); @@ -267,28 +225,28 @@ uint8_t NumBlocksPerSector(uint8_t sectorNo) int CmdHF14AMfDump(const char *Cmd) { uint8_t sectorNo, blockNo; - + uint8_t keyA[40][6]; uint8_t keyB[40][6]; uint8_t rights[40][4]; uint8_t carddata[256][16]; uint8_t numSectors = 16; - + FILE *fin; FILE *fout; - + UsbCommand resp; char cmdp = param_getchar(Cmd, 0); switch (cmdp) { case '0' : numSectors = 5; break; - case '1' : + case '1' : case '\0': numSectors = 16; break; case '2' : numSectors = 32; break; case '4' : numSectors = 40; break; default: numSectors = 16; - } - + } + if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') { PrintAndLog("Usage: hf mf dump [card memory]"); PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K"); @@ -297,12 +255,12 @@ int CmdHF14AMfDump(const char *Cmd) PrintAndLog(" hf mf dump 4"); return 0; } - + if ((fin = fopen("dumpkeys.bin","rb")) == NULL) { PrintAndLog("Could not find file dumpkeys.bin"); return 1; } - + // Read keys A from file for (sectorNo=0; sectorNo 1 || cmdp == 'h' || cmdp == 'H') { PrintAndLog("Usage: hf mf restore [card memory]"); @@ -478,7 +436,7 @@ int CmdHF14AMfRestore(const char *Cmd) PrintAndLog("Could not find file dumpkeys.bin"); return 1; } - + for (sectorNo = 0; sectorNo < numSectors; sectorNo++) { size_t bytes_read = fread(keyA[sectorNo], 1, 6, fkeys); if (bytes_read != 6) { @@ -502,21 +460,21 @@ int CmdHF14AMfRestore(const char *Cmd) if ((fdump = fopen("dumpdata.bin","rb")) == NULL) { PrintAndLog("Could not find file dumpdata.bin"); return 1; - } + } PrintAndLog("Restoring dumpdata.bin to card"); for (sectorNo = 0; sectorNo < numSectors; sectorNo++) { for(blockNo = 0; blockNo < NumBlocksPerSector(sectorNo); blockNo++) { UsbCommand c = {CMD_MIFARE_WRITEBL, {FirstBlockOfSector(sectorNo) + blockNo, keyType, 0}}; memcpy(c.d.asBytes, key, 6); - + size_t bytes_read = fread(bldata, 1, 16, fdump); if (bytes_read != 16) { PrintAndLog("File reading error (dumpdata.bin)."); fclose(fdump); return 2; } - + if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer bldata[0] = (keyA[sectorNo][0]); bldata[1] = (keyA[sectorNo][1]); @@ -530,10 +488,10 @@ int CmdHF14AMfRestore(const char *Cmd) bldata[13] = (keyB[sectorNo][3]); bldata[14] = (keyB[sectorNo][4]); bldata[15] = (keyB[sectorNo][5]); - } - + } + PrintAndLog("Writing to block %3d: %s", FirstBlockOfSector(sectorNo) + blockNo, sprint_hex(bldata, 16)); - + memcpy(c.d.asBytes + 10, bldata, 16); SendCommand(&c); @@ -546,15 +504,22 @@ int CmdHF14AMfRestore(const char *Cmd) } } } - + fclose(fdump); return 0; } + +typedef struct { + uint64_t Key[2]; + int foundKey[2]; +} sector_t; + + int CmdHF14AMfNested(const char *Cmd) { int i, j, res, iterations; - sector *e_sector = NULL; + sector_t *e_sector = NULL; uint8_t blockNo = 0; uint8_t keyType = 0; uint8_t trgBlockNo = 0; @@ -564,12 +529,12 @@ int CmdHF14AMfNested(const char *Cmd) uint8_t keyBlock[14*6]; uint64_t key64 = 0; bool transferToEml = false; - + bool createDumpFile = false; FILE *fkeys; uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; - + char cmdp, ctmp; if (strlen(Cmd)<3) { @@ -586,25 +551,25 @@ int CmdHF14AMfNested(const char *Cmd) PrintAndLog(" sample3: hf mf nested 1 0 A FFFFFFFFFFFF d "); PrintAndLog(" sample4: hf mf nested o 0 A FFFFFFFFFFFF 4 A"); return 0; - } - + } + cmdp = param_getchar(Cmd, 0); blockNo = param_get8(Cmd, 1); ctmp = param_getchar(Cmd, 2); - + if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') { PrintAndLog("Key type must be A or B"); return 1; } - - if (ctmp != 'A' && ctmp != 'a') + + if (ctmp != 'A' && ctmp != 'a') keyType = 1; - + if (param_gethex(Cmd, 3, key, 12)) { PrintAndLog("Key must include 12 HEX symbols"); return 1; } - + if (cmdp == 'o' || cmdp == 'O') { cmdp = 'o'; trgBlockNo = param_get8(Cmd, 4); @@ -613,10 +578,10 @@ int CmdHF14AMfNested(const char *Cmd) PrintAndLog("Target key type must be A or B"); return 1; } - if (ctmp != 'A' && ctmp != 'a') + if (ctmp != 'A' && ctmp != 'a') trgKeyType = 1; } else { - + switch (cmdp) { case '0': SectorsCnt = 05; break; case '1': SectorsCnt = 16; break; @@ -629,11 +594,11 @@ int CmdHF14AMfNested(const char *Cmd) ctmp = param_getchar(Cmd, 4); if (ctmp == 't' || ctmp == 'T') transferToEml = true; else if (ctmp == 'd' || ctmp == 'D') createDumpFile = true; - + ctmp = param_getchar(Cmd, 6); transferToEml |= (ctmp == 't' || ctmp == 'T'); transferToEml |= (ctmp == 'd' || ctmp == 'D'); - + if (cmdp == 'o') { PrintAndLog("--target block no:%3d, target key type:%c ", trgBlockNo, trgKeyType?'B':'A'); int16_t isOK = mfnested(blockNo, keyType, key, trgBlockNo, trgKeyType, keyBlock, true); @@ -659,24 +624,24 @@ int CmdHF14AMfNested(const char *Cmd) sectortrailer = (trgBlockNo & 0x0f) + 15; } mfEmlGetMem(keyBlock, sectortrailer, 1); - + if (!trgKeyType) num_to_bytes(key64, 6, keyBlock); else num_to_bytes(key64, 6, &keyBlock[10]); - mfEmlSetMem(keyBlock, sectortrailer, 1); + mfEmlSetMem(keyBlock, sectortrailer, 1); } } else { PrintAndLog("No valid key found"); } } else { // ------------------------------------ multiple sectors working - clock_t time1; - time1 = clock(); + uint64_t msclock1; + msclock1 = msclock(); - e_sector = calloc(SectorsCnt, sizeof(sector)); + e_sector = calloc(SectorsCnt, sizeof(sector_t)); if (e_sector == NULL) return 1; - + //test current key and additional standard keys first memcpy(keyBlock, key, 6); num_to_bytes(0xffffffffffff, 6, (uint8_t*)(keyBlock + 1 * 6)); @@ -697,23 +662,23 @@ int CmdHF14AMfNested(const char *Cmd) for (i = 0; i < SectorsCnt; i++) { for (j = 0; j < 2; j++) { if (e_sector[i].foundKey[j]) continue; - + res = mfCheckKeys(FirstBlockOfSector(i), j, true, 6, keyBlock, &key64); - + if (!res) { e_sector[i].Key[j] = key64; e_sector[i].foundKey[j] = 1; } } } - + // nested sectors iterations = 0; PrintAndLog("nested..."); bool calibrate = true; for (i = 0; i < NESTED_SECTOR_RETRY; i++) { for (uint8_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) { - for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { + for (trgKeyType = 0; trgKeyType < 2; trgKeyType++) { if (e_sector[sectorNo].foundKey[trgKeyType]) continue; PrintAndLog("-----------------------------------------------"); int16_t isOK = mfnested(blockNo, keyType, key, FirstBlockOfSector(sectorNo), trgKeyType, keyBlock, calibrate); @@ -729,7 +694,7 @@ int CmdHF14AMfNested(const char *Cmd) } else { calibrate = false; } - + iterations++; key64 = bytes_to_num(keyBlock, 6); @@ -742,8 +707,8 @@ int CmdHF14AMfNested(const char *Cmd) } } - 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); - + printf("Time in nested: %1.3f (%1.3f sec per key)\n\n", ((float)(msclock() - msclock1))/1000.0, ((float)(msclock() - msclock1))/iterations/1000.0); + PrintAndLog("-----------------------------------------------\nIterations count: %d\n\n", iterations); //print them PrintAndLog("|---|----------------|---|----------------|---|"); @@ -754,7 +719,7 @@ int CmdHF14AMfNested(const char *Cmd) e_sector[i].Key[0], e_sector[i].foundKey[0], e_sector[i].Key[1], e_sector[i].foundKey[1]); } PrintAndLog("|---|----------------|---|----------------|---|"); - + // transfer them to the emulator if (transferToEml) { for (i = 0; i < SectorsCnt; i++) { @@ -764,12 +729,12 @@ int CmdHF14AMfNested(const char *Cmd) if (e_sector[i].foundKey[1]) num_to_bytes(e_sector[i].Key[1], 6, &keyBlock[10]); mfEmlSetMem(keyBlock, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1); - } + } } - + // Create dump file if (createDumpFile) { - if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { + if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { PrintAndLog("Could not create file dumpkeys.bin"); free(e_sector); return 1; @@ -795,12 +760,133 @@ int CmdHF14AMfNested(const char *Cmd) } fclose(fkeys); } - + free(e_sector); } return 0; } + +int CmdHF14AMfNestedHard(const char *Cmd) +{ + uint8_t blockNo = 0; + uint8_t keyType = 0; + uint8_t trgBlockNo = 0; + uint8_t trgKeyType = 0; + uint8_t key[6] = {0, 0, 0, 0, 0, 0}; + uint8_t trgkey[6] = {0, 0, 0, 0, 0, 0}; + + char ctmp; + ctmp = param_getchar(Cmd, 0); + + if (ctmp != 'R' && ctmp != 'r' && ctmp != 'T' && ctmp != 't' && strlen(Cmd) < 20) { + PrintAndLog("Usage:"); + PrintAndLog(" hf mf hardnested "); + PrintAndLog(" [known target key (12 hex symbols)] [w] [s]"); + PrintAndLog(" or hf mf hardnested r [known target key]"); + PrintAndLog(" "); + PrintAndLog("Options: "); + PrintAndLog(" w: Acquire nonces and write them to binary file nonces.bin"); + PrintAndLog(" s: Slower acquisition (required by some non standard cards)"); + PrintAndLog(" r: Read nonces.bin and start attack"); + PrintAndLog(" "); + PrintAndLog(" sample1: hf mf hardnested 0 A FFFFFFFFFFFF 4 A"); + PrintAndLog(" sample2: hf mf hardnested 0 A FFFFFFFFFFFF 4 A w"); + PrintAndLog(" sample3: hf mf hardnested 0 A FFFFFFFFFFFF 4 A w s"); + PrintAndLog(" sample4: hf mf hardnested r"); + PrintAndLog(" "); + PrintAndLog("Add the known target key to check if it is present in the remaining key space:"); + PrintAndLog(" sample5: hf mf hardnested 0 A A0A1A2A3A4A5 4 A FFFFFFFFFFFF"); + return 0; + } + + bool know_target_key = false; + bool nonce_file_read = false; + bool nonce_file_write = false; + bool slow = false; + int tests = 0; + + + if (ctmp == 'R' || ctmp == 'r') { + nonce_file_read = true; + if (!param_gethex(Cmd, 1, trgkey, 12)) { + know_target_key = true; + } + } else if (ctmp == 'T' || ctmp == 't') { + tests = param_get32ex(Cmd, 1, 100, 10); + if (!param_gethex(Cmd, 2, trgkey, 12)) { + know_target_key = true; + } + } else { + blockNo = param_get8(Cmd, 0); + ctmp = param_getchar(Cmd, 1); + if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') { + PrintAndLog("Key type must be A or B"); + return 1; + } + if (ctmp != 'A' && ctmp != 'a') { + keyType = 1; + } + + if (param_gethex(Cmd, 2, key, 12)) { + PrintAndLog("Key must include 12 HEX symbols"); + return 1; + } + + trgBlockNo = param_get8(Cmd, 3); + ctmp = param_getchar(Cmd, 4); + if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') { + PrintAndLog("Target key type must be A or B"); + return 1; + } + if (ctmp != 'A' && ctmp != 'a') { + trgKeyType = 1; + } + + uint16_t i = 5; + + if (!param_gethex(Cmd, 5, trgkey, 12)) { + know_target_key = true; + i++; + } + + while ((ctmp = param_getchar(Cmd, i))) { + if (ctmp == 's' || ctmp == 'S') { + slow = true; + } else if (ctmp == 'w' || ctmp == 'W') { + nonce_file_write = true; + } else { + PrintAndLog("Possible options are w and/or s"); + return 1; + } + i++; + } + } + + 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 ", + trgBlockNo, + trgKeyType?'B':'A', + trgkey[0], trgkey[1], trgkey[2], trgkey[3], trgkey[4], trgkey[5], + know_target_key?"":" (not set)", + nonce_file_write?"write":nonce_file_read?"read":"none", + slow?"Yes":"No", + tests); + + int16_t isOK = mfnestedhard(blockNo, keyType, key, trgBlockNo, trgKeyType, know_target_key?trgkey:NULL, nonce_file_read, nonce_file_write, slow, tests); + + if (isOK) { + switch (isOK) { + case 1 : PrintAndLog("Error: No response from Proxmark.\n"); break; + case 2 : PrintAndLog("Button pressed. Aborted.\n"); break; + default : break; + } + return 2; + } + + return 0; +} + + int CmdHF14AMfChk(const char *Cmd) { if (strlen(Cmd)<3) { @@ -813,14 +899,14 @@ int CmdHF14AMfChk(const char *Cmd) PrintAndLog(" hf mf chk *1 ? t"); PrintAndLog(" hf mf chk *1 ? d"); return 0; - } + } FILE * f; char filename[FILE_PATH_SIZE]={0}; char buf[13]; uint8_t *keyBlock = NULL, *p; - uint8_t stKeyBlock = 20; - + uint16_t stKeyBlock = 20; + int i, res; int keycnt = 0; char ctmp = 0x00; @@ -828,7 +914,7 @@ int CmdHF14AMfChk(const char *Cmd) uint8_t SectorsCnt = 1; uint8_t keyType = 0; uint64_t key64 = 0; - + int transferToEml = 0; int createDumpFile = 0; @@ -857,7 +943,7 @@ int CmdHF14AMfChk(const char *Cmd) { num_to_bytes(defaultKeys[defaultKeyCounter], 6, (uint8_t*)(keyBlock + defaultKeyCounter * 6)); } - + if (param_getchar(Cmd, 0)=='*') { blockNo = 3; switch(param_getchar(Cmd+1, 0)) { @@ -870,9 +956,9 @@ int CmdHF14AMfChk(const char *Cmd) } else blockNo = param_get8(Cmd, 0); - + ctmp = param_getchar(Cmd, 1); - switch (ctmp) { + switch (ctmp) { case 'a': case 'A': keyType = !0; break; @@ -884,13 +970,14 @@ int CmdHF14AMfChk(const char *Cmd) break; default: PrintAndLog("Key type must be A , B or ?"); + free(keyBlock); return 1; }; - + ctmp = param_getchar(Cmd, 2); if (ctmp == 't' || ctmp == 'T') transferToEml = 1; else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1; - + for (i = transferToEml || createDumpFile; param_getchar(Cmd, 2 + i); i++) { if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) { if ( stKeyBlock - keycnt < 2) { @@ -913,21 +1000,21 @@ int CmdHF14AMfChk(const char *Cmd) free(keyBlock); return 2; } - + if ( (f = fopen( filename , "r")) ) { while( fgets(buf, sizeof(buf), f) ){ if (strlen(buf) < 12 || buf[11] == '\n') continue; - + while (fgetc(f) != '\n' && !feof(f)) ; //goto next line - + if( buf[0]=='#' ) continue; //The line start with # is comment, skip if (!isxdigit(buf[0])){ PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf); continue; } - + buf[12] = 0; if ( stKeyBlock - keycnt < 2) { @@ -951,11 +1038,11 @@ int CmdHF14AMfChk(const char *Cmd) PrintAndLog("File: %s: not found or locked.", filename); free(keyBlock); return 1; - + } } } - + if (keycnt == 0) { PrintAndLog("No key specified, trying default keys"); for (;keycnt < defaultKeysSize; keycnt++) @@ -963,7 +1050,7 @@ int CmdHF14AMfChk(const char *Cmd) (keyBlock + 6*keycnt)[0],(keyBlock + 6*keycnt)[1], (keyBlock + 6*keycnt)[2], (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6); } - + // initialize storage for found keys bool validKey[2][40]; uint8_t foundKey[2][40][6]; @@ -975,7 +1062,7 @@ int CmdHF14AMfChk(const char *Cmd) } } } - + for ( int t = !keyType; t < 2; keyType==2?(t++):(t=2) ) { int b=blockNo; for (int i = 0; i < SectorsCnt; ++i) { @@ -989,12 +1076,12 @@ int CmdHF14AMfChk(const char *Cmd) PrintAndLog("Found valid key:[%012" PRIx64 "]",key64); num_to_bytes(key64, 6, foundKey[t][i]); validKey[t][i] = true; - } + } } else { PrintAndLog("Command execute timeout"); } } - b<127?(b+=4):(b+=16); + b<127?(b+=4):(b+=16); } } @@ -1016,7 +1103,7 @@ int CmdHF14AMfChk(const char *Cmd) if (createDumpFile) { FILE *fkeys = fopen("dumpkeys.bin","wb"); - if (fkeys == NULL) { + if (fkeys == NULL) { PrintAndLog("Could not create file dumpkeys.bin"); free(keyBlock); return 1; @@ -1034,7 +1121,8 @@ int CmdHF14AMfChk(const char *Cmd) } void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack) { - #define ATTACK_KEY_COUNT 8 // keep same as define in iso14443a.c -> Mifare1ksim() + #define ATTACK_KEY_COUNT 7 // keep same as define in iso14443a.c -> Mifare1ksim() + // cannot be more than 7 or it will overrun c.d.asBytes(512) uint64_t key = 0; typedef struct { uint64_t keyA; @@ -1071,7 +1159,7 @@ void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack } } } - } else if (tryMfk32_moebius(ar_resp[i+ATTACK_KEY_COUNT], &key)) { + } else if (mfkey32_moebius(ar_resp[i+ATTACK_KEY_COUNT], &key)) { uint8_t sectorNum = ar_resp[i+ATTACK_KEY_COUNT].sector; uint8_t keyType = ar_resp[i+ATTACK_KEY_COUNT].keytype; @@ -1116,11 +1204,11 @@ void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack PrintAndLog("block data must include 32 HEX symbols"); return; } - + UsbCommand c = {CMD_MIFARE_EML_MEMSET, {(stSector[i]*4+3), 1, 0}}; memcpy(c.d.asBytes, memBlock, 16); clearCommandBuffer(); - SendCommand(&c); + SendCommand(&c); } } } @@ -1152,7 +1240,7 @@ int usage_hf14_mf1ksim(void) { PrintAndLog(" hf mf sim u 112233445566778899AA"); PrintAndLog(" hf mf sim f uids.txt"); PrintAndLog(" hf mf sim u 0a0a0a0a e"); - + return 0; } @@ -1255,9 +1343,9 @@ int CmdHF14AMf1kSim(const char *Cmd) { memset(buf, 0, sizeof(buf)); memset(uid, 0, sizeof(uid)); - if (fgets(buf, sizeof(buf), f) == NULL) { + if (fgets(buf, sizeof(buf), f) == NULL) { if (count > 0) break; - + PrintAndLog("File reading error."); fclose(f); return 2; @@ -1269,7 +1357,7 @@ int CmdHF14AMf1kSim(const char *Cmd) { case 20: flags |= FLAG_10B_UID_IN_DATA; break; //not complete case 14: flags |= FLAG_7B_UID_IN_DATA; break; case 8: flags |= FLAG_4B_UID_IN_DATA; break; - default: + default: PrintAndLog("uid in file wrong length at %d (length: %d) [%s]",count, uidlen, buf); fclose(f); return 2; @@ -1278,10 +1366,10 @@ int CmdHF14AMf1kSim(const char *Cmd) { for (uint8_t i = 0; i < uidlen; i += 2) { sscanf(&buf[i], "%02x", (unsigned int *)&uid[i / 2]); } - + PrintAndLog("mf 1k sim uid: %s, numreads:%d, flags:%d (0x%02x) - press button to abort", flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4): - flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): + flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): flags & FLAG_10B_UID_IN_DATA ? sprint_hex(uid,10): "N/A" , exitAfterNReads, flags, flags); @@ -1311,7 +1399,7 @@ int CmdHF14AMf1kSim(const char *Cmd) { PrintAndLog("mf 1k sim uid: %s, numreads:%d, flags:%d (0x%02x) ", flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4): - flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): + flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): flags & FLAG_10B_UID_IN_DATA ? sprint_hex(uid,10): "N/A" , exitAfterNReads, flags, flags); @@ -1355,7 +1443,7 @@ int CmdHF14AMfDbg(const char *Cmd) PrintAndLog(" 4 - print even debug messages in timing critical functions"); PrintAndLog(" Note: this option therefore may cause malfunction itself"); return 0; - } + } UsbCommand c = {CMD_MIFARE_SET_DBGMODE, {dbgMode, 0, 0}}; SendCommand(&c); @@ -1372,8 +1460,8 @@ int CmdHF14AMfEGet(const char *Cmd) PrintAndLog("Usage: hf mf eget "); PrintAndLog(" sample: hf mf eget 0 "); return 0; - } - + } + blockNo = param_get8(Cmd, 0); PrintAndLog(" "); @@ -1392,7 +1480,7 @@ int CmdHF14AMfEClear(const char *Cmd) PrintAndLog("Usage: hf mf eclr"); PrintAndLog("It set card emulator memory to empty data blocks and key A/B FFFFFFFFFFFF \n"); return 0; - } + } UsbCommand c = {CMD_MIFARE_EML_MEMCLR, {0, 0, 0}}; SendCommand(&c); @@ -1411,15 +1499,15 @@ int CmdHF14AMfESet(const char *Cmd) PrintAndLog("Usage: hf mf eset "); PrintAndLog(" sample: hf mf eset 1 000102030405060708090a0b0c0d0e0f "); return 0; - } - + } + blockNo = param_get8(Cmd, 0); - + if (param_gethex(Cmd, 1, memBlock, 32)) { PrintAndLog("block data must include 32 HEX symbols"); return 1; } - + // 1 - blocks count UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNo, 1, 0}}; memcpy(c.d.asBytes, memBlock, 16); @@ -1437,9 +1525,9 @@ int CmdHF14AMfELoad(const char *Cmd) uint8_t buf8[64] = {0x00}; int i, len, blockNum, numBlocks; int nameParamNo = 1; - + char ctmp = param_getchar(Cmd, 0); - + if ( ctmp == 'h' || ctmp == 0x00) { PrintAndLog("It loads emul dump from the file `filename.eml`"); PrintAndLog("Usage: hf mf eload [card memory] "); @@ -1448,11 +1536,11 @@ int CmdHF14AMfELoad(const char *Cmd) PrintAndLog(" sample: hf mf eload filename"); PrintAndLog(" hf mf eload 4 filename"); return 0; - } + } switch (ctmp) { case '0' : numBlocks = 5*4; break; - case '1' : + case '1' : case '\0': numBlocks = 16*4; break; case '2' : numBlocks = 32*4; break; case '4' : numBlocks = 256; break; @@ -1463,33 +1551,33 @@ int CmdHF14AMfELoad(const char *Cmd) } len = param_getstr(Cmd,nameParamNo,filename); - + if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5; fnameptr += len; - sprintf(fnameptr, ".eml"); - + sprintf(fnameptr, ".eml"); + // open file f = fopen(filename, "r"); if (f == NULL) { PrintAndLog("File %s not found or locked", filename); return 1; } - + blockNum = 0; while(!feof(f)){ memset(buf, 0, sizeof(buf)); - + if (fgets(buf, sizeof(buf), f) == NULL) { - + if (blockNum >= numBlocks) break; - + PrintAndLog("File reading error."); fclose(f); return 2; } - + if (strlen(buf) < 32){ if(strlen(buf) && feof(f)) break; @@ -1497,11 +1585,11 @@ int CmdHF14AMfELoad(const char *Cmd) fclose(f); return 2; } - + for (i = 0; i < 32; i += 2) { sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 2]); } - + if (mfEmlSetMem(buf8, blockNum, 1)) { PrintAndLog("Cant set emul block: %3d", blockNum); fclose(f); @@ -1509,12 +1597,12 @@ int CmdHF14AMfELoad(const char *Cmd) } printf("."); blockNum++; - + if (blockNum >= numBlocks) break; } fclose(f); printf("\n"); - + if ((blockNum != numBlocks)) { PrintAndLog("File content error. Got %d must be %d blocks.",blockNum, numBlocks); return 4; @@ -1532,12 +1620,12 @@ int CmdHF14AMfESave(const char *Cmd) uint8_t buf[64]; int i, j, len, numBlocks; int nameParamNo = 1; - + memset(filename, 0, sizeof(filename)); memset(buf, 0, sizeof(buf)); char ctmp = param_getchar(Cmd, 0); - + if ( ctmp == 'h' || ctmp == 'H') { PrintAndLog("It saves emul dump into the file `filename.eml` or `cardID.eml`"); PrintAndLog(" Usage: hf mf esave [card memory] [file name w/o `.eml`]"); @@ -1547,11 +1635,11 @@ int CmdHF14AMfESave(const char *Cmd) PrintAndLog(" hf mf esave 4"); PrintAndLog(" hf mf esave 4 filename"); return 0; - } + } switch (ctmp) { case '0' : numBlocks = 5*4; break; - case '1' : + case '1' : case '\0': numBlocks = 16*4; break; case '2' : numBlocks = 32*4; break; case '4' : numBlocks = 256; break; @@ -1562,9 +1650,9 @@ int CmdHF14AMfESave(const char *Cmd) } len = param_getstr(Cmd,nameParamNo,filename); - + if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5; - + // user supplied filename? if (len < 1) { // get filename (UID from memory) @@ -1582,8 +1670,8 @@ int CmdHF14AMfESave(const char *Cmd) } // add file extension - sprintf(fnameptr, ".eml"); - + sprintf(fnameptr, ".eml"); + // open file f = fopen(filename, "w+"); @@ -1591,7 +1679,7 @@ int CmdHF14AMfESave(const char *Cmd) PrintAndLog("Can't open file %s ", filename); return 1; } - + // put hex for (i = 0; i < numBlocks; i++) { if (mfEmlGetMem(buf, i, 1)) { @@ -1599,13 +1687,13 @@ int CmdHF14AMfESave(const char *Cmd) break; } for (j = 0; j < 16; j++) - fprintf(f, "%02X", buf[j]); + fprintf(f, "%02X", buf[j]); fprintf(f,"\n"); } fclose(f); - + PrintAndLog("Saved %d blocks to file: %s", numBlocks, filename); - + return 0; } @@ -1614,7 +1702,7 @@ int CmdHF14AMfECFill(const char *Cmd) { uint8_t keyType = 0; uint8_t numSectors = 16; - + if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { PrintAndLog("Usage: hf mf ecfill [card memory]"); PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K"); @@ -1624,7 +1712,7 @@ int CmdHF14AMfECFill(const char *Cmd) PrintAndLog("Read card and transfer its data to emulator memory."); PrintAndLog("Keys must be laid in the emulator memory. \n"); return 0; - } + } char ctmp = param_getchar(Cmd, 0); if (ctmp != 'a' && ctmp != 'A' && ctmp != 'b' && ctmp != 'B') { @@ -1636,12 +1724,12 @@ int CmdHF14AMfECFill(const char *Cmd) ctmp = param_getchar(Cmd, 1); switch (ctmp) { case '0' : numSectors = 5; break; - case '1' : + case '1' : case '\0': numSectors = 16; break; case '2' : numSectors = 32; break; case '4' : numSectors = 40; break; default: numSectors = 16; - } + } printf("--params: numSectors: %d, keyType:%d", numSectors, keyType); UsbCommand c = {CMD_MIFARE_EML_CARDLOAD, {numSectors, keyType, 0}}; @@ -1649,14 +1737,13 @@ int CmdHF14AMfECFill(const char *Cmd) return 0; } - int CmdHF14AMfEKeyPrn(const char *Cmd) { int i; uint8_t numSectors; uint8_t data[16]; uint64_t keyA, keyB; - + if (param_getchar(Cmd, 0) == 'h') { PrintAndLog("It prints the keys loaded in the emulator memory"); PrintAndLog("Usage: hf mf ekeyprn [card memory]"); @@ -1664,19 +1751,19 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) PrintAndLog(""); PrintAndLog(" sample: hf mf ekeyprn 1"); return 0; - } + } char cmdp = param_getchar(Cmd, 0); - + switch (cmdp) { case '0' : numSectors = 5; break; - case '1' : + case '1' : case '\0': numSectors = 16; break; case '2' : numSectors = 32; break; case '4' : numSectors = 40; break; default: numSectors = 16; - } - + } + PrintAndLog("|---|----------------|----------------|"); PrintAndLog("|sec|key A |key B |"); PrintAndLog("|---|----------------|----------------|"); @@ -1690,77 +1777,154 @@ int CmdHF14AMfEKeyPrn(const char *Cmd) PrintAndLog("|%03d| %012" PRIx64 " | %012" PRIx64 " |", i, keyA, keyB); } PrintAndLog("|---|----------------|----------------|"); - + return 0; } - int CmdHF14AMfCSetUID(const char *Cmd) { - uint8_t wipeCard = 0; uint8_t uid[8] = {0x00}; uint8_t oldUid[8] = {0x00}; uint8_t atqa[2] = {0x00}; uint8_t sak[1] = {0x00}; - uint8_t atqaPresent = 1; + uint8_t atqaPresent = 0; int res; - char ctmp; - int argi=0; - if (strlen(Cmd) < 1 || param_getchar(Cmd, argi) == 'h') { - PrintAndLog("Usage: hf mf csetuid [ATQA 4 hex symbols SAK 2 hex symbols] [w]"); + uint8_t needHelp = 0; + char cmdp = 1; + + if (param_getchar(Cmd, 0) && param_gethex(Cmd, 0, uid, 8)) { + PrintAndLog("UID must include 8 HEX symbols"); + return 1; + } + + if (param_getlength(Cmd, 1) > 1 && param_getlength(Cmd, 2) > 1) { + atqaPresent = 1; + cmdp = 3; + + if (param_gethex(Cmd, 1, atqa, 4)) { + PrintAndLog("ATQA must include 4 HEX symbols"); + return 1; + } + + if (param_gethex(Cmd, 2, sak, 2)) { + PrintAndLog("SAK must include 2 HEX symbols"); + return 1; + } + } + + while(param_getchar(Cmd, cmdp) != 0x00) + { + switch(param_getchar(Cmd, cmdp)) + { + case 'h': + case 'H': + needHelp = 1; + break; + default: + PrintAndLog("ERROR: Unknown parameter '%c'", param_getchar(Cmd, cmdp)); + needHelp = 1; + break; + } + cmdp++; + } + + if (strlen(Cmd) < 1 || needHelp) { + PrintAndLog(""); + PrintAndLog("Usage: hf mf csetuid [ATQA 4 hex symbols SAK 2 hex symbols]"); PrintAndLog("sample: hf mf csetuid 01020304"); - PrintAndLog("sample: hf mf csetuid 01020304 0004 08 w"); + PrintAndLog("sample: hf mf csetuid 01020304 0004 08"); PrintAndLog("Set UID, ATQA, and SAK for magic Chinese card (only works with such cards)"); - PrintAndLog("If you also want to wipe the card then add 'w' at the end of the command line."); return 0; } - if (param_getchar(Cmd, argi) && param_gethex(Cmd, argi, uid, 8)) { - PrintAndLog("UID must include 8 HEX symbols"); - return 1; + PrintAndLog("uid:%s", sprint_hex(uid, 4)); + if (atqaPresent) { + PrintAndLog("--atqa:%s sak:%02x", sprint_hex(atqa, 2), sak[0]); } - argi++; - ctmp = param_getchar(Cmd, argi); - if (ctmp == 'w' || ctmp == 'W') { - wipeCard = 1; - atqaPresent = 0; + res = mfCSetUID(uid, (atqaPresent)?atqa:NULL, (atqaPresent)?sak:NULL, oldUid); + if (res) { + PrintAndLog("Can't set UID. Error=%d", res); + return 1; + } + + PrintAndLog("old UID:%s", sprint_hex(oldUid, 4)); + PrintAndLog("new UID:%s", sprint_hex(uid, 4)); + return 0; +} + +static int ParamGetCardSize(const char c) { + int numBlocks = 16 * 4; + switch (c) { + case '0' : numBlocks = 5 * 4; break; + case '2' : numBlocks = 32 * 4; break; + case '4' : numBlocks = 32 * 4 + 8 * 16; break; + default: numBlocks = 16 * 4; } + return numBlocks; +} - if (atqaPresent) { - if (param_getchar(Cmd, argi)) { - if (param_gethex(Cmd, argi, atqa, 4)) { - PrintAndLog("ATQA must include 4 HEX symbols"); - return 1; - } - argi++; - if (!param_getchar(Cmd, argi) || param_gethex(Cmd, argi, sak, 2)) { - PrintAndLog("SAK must include 2 HEX symbols"); - return 1; - } - argi++; - } else - atqaPresent = 0; +int CmdHF14AMfCWipe(const char *Cmd) +{ + int res, gen = 0; + int numBlocks = 16 * 4; + bool wipeCard = false; + bool fillCard = false; + + if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { + PrintAndLog("Usage: hf mf cwipe [card size] [w] [p]"); + PrintAndLog("sample: hf mf cwipe 1 w s"); + PrintAndLog("[card size]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K"); + PrintAndLog("w - Wipe magic Chinese card (only works with gen:1a cards)"); + PrintAndLog("f - Fill the card with default data and keys (works with gen:1a and gen:1b cards only)"); + return 0; } - if(!wipeCard) { - ctmp = param_getchar(Cmd, argi); - if (ctmp == 'w' || ctmp == 'W') { + gen = mfCIdentify(); + if ((gen != 1) && (gen != 2)) + return 1; + + numBlocks = ParamGetCardSize(param_getchar(Cmd, 0)); + + char cmdp = 0; + while(param_getchar(Cmd, cmdp) != 0x00){ + switch(param_getchar(Cmd, cmdp)) { + case 'w': + case 'W': wipeCard = 1; + break; + case 'f': + case 'F': + fillCard = 1; + break; + default: + break; } + cmdp++; } - PrintAndLog("--wipe card:%s uid:%s", (wipeCard)?"YES":"NO", sprint_hex(uid, 4)); + if (!wipeCard && !fillCard) + wipeCard = true; - res = mfCSetUID(uid, (atqaPresent)?atqa:NULL, (atqaPresent)?sak:NULL, oldUid, wipeCard); - if (res) { - PrintAndLog("Can't set UID. error=%d", res); - return 1; + PrintAndLog("--blocks count:%2d wipe:%c fill:%c", numBlocks, (wipeCard)?'y':'n', (fillCard)?'y':'n'); + + if (gen == 2) { + /* generation 1b magic card */ + if (wipeCard) { + PrintAndLog("WARNING: can't wipe magic card 1b generation"); } - - PrintAndLog("old UID:%s", sprint_hex(oldUid, 4)); - PrintAndLog("new UID:%s", sprint_hex(uid, 4)); + res = mfCWipe(numBlocks, true, false, fillCard); + } else { + /* generation 1a magic card by default */ + res = mfCWipe(numBlocks, false, wipeCard, fillCard); + } + + if (res) { + PrintAndLog("Can't wipe. error=%d", res); + return 1; + } + PrintAndLog("OK"); return 0; } @@ -1768,8 +1932,8 @@ int CmdHF14AMfCSetBlk(const char *Cmd) { uint8_t memBlock[16] = {0x00}; uint8_t blockNo = 0; - bool wipeCard = FALSE; - int res; + bool wipeCard = false; + int res, gen = 0; if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { PrintAndLog("Usage: hf mf csetblk [w]"); @@ -1777,7 +1941,11 @@ int CmdHF14AMfCSetBlk(const char *Cmd) PrintAndLog("Set block data for magic Chinese card (only works with such cards)"); PrintAndLog("If you also want wipe the card then add 'w' at the end of the command line"); return 0; - } + } + + gen = mfCIdentify(); + if ((gen != 1) && (gen != 2)) + return 1; blockNo = param_get8(Cmd, 0); @@ -1790,7 +1958,14 @@ int CmdHF14AMfCSetBlk(const char *Cmd) wipeCard = (ctmp == 'w' || ctmp == 'W'); PrintAndLog("--block number:%2d data:%s", blockNo, sprint_hex(memBlock, 16)); - res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER); + if (gen == 2) { + /* generation 1b magic card */ + res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B); + } else { + /* generation 1a magic card by default */ + res = mfCSetBlock(blockNo, memBlock, NULL, wipeCard, CSETBLOCK_SINGLE_OPER); + } + if (res) { PrintAndLog("Can't write block. error=%d", res); return 1; @@ -1804,33 +1979,44 @@ int CmdHF14AMfCLoad(const char *Cmd) FILE * f; char filename[FILE_PATH_SIZE] = {0x00}; char * fnameptr = filename; - char buf[64] = {0x00}; - uint8_t buf8[64] = {0x00}; + char buf[256] = {0x00}; + uint8_t buf8[256] = {0x00}; uint8_t fillFromEmulator = 0; - int i, len, blockNum, flags=0; - + int i, len, blockNum, flags = 0, gen = 0, numblock = 64; + if (param_getchar(Cmd, 0) == 'h' || param_getchar(Cmd, 0)== 0x00) { PrintAndLog("It loads magic Chinese card from the file `filename.eml`"); - PrintAndLog("or from emulator memory (option `e`)"); - PrintAndLog("Usage: hf mf cload "); - PrintAndLog(" or: hf mf cload e "); - PrintAndLog(" sample: hf mf cload filename"); + PrintAndLog("or from emulator memory (option `e`). 4K card: (option `4`)"); + PrintAndLog("Usage: hf mf cload [file name w/o `.eml`][e][4]"); + PrintAndLog(" or: hf mf cload e [4]"); + PrintAndLog("Sample: hf mf cload filename"); + PrintAndLog(" hf mf cload filname 4"); + PrintAndLog(" hf mf cload e"); + PrintAndLog(" hf mf cload e 4"); return 0; - } + } char ctmp = param_getchar(Cmd, 0); if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1; - + ctmp = param_getchar(Cmd, 1); + if (ctmp == '4') numblock = 256; + + gen = mfCIdentify(); + PrintAndLog("Loading magic mifare %dK", numblock == 256 ? 4:1); + if (fillFromEmulator) { - for (blockNum = 0; blockNum < 16 * 4; blockNum += 1) { + for (blockNum = 0; blockNum < numblock; blockNum += 1) { if (mfEmlGetMem(buf8, blockNum, 1)) { PrintAndLog("Cant get block: %d", blockNum); return 2; } if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; // switch on field and send magic sequence if (blockNum == 1) flags = 0; // just write - if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field. + if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field. + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) { PrintAndLog("Cant set magic card block: %d", blockNum); return 3; @@ -1838,26 +2024,28 @@ int CmdHF14AMfCLoad(const char *Cmd) } return 0; } else { - len = strlen(Cmd); + param_getstr(Cmd, 0, filename); + + len = strlen(filename); if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5; - memcpy(filename, Cmd, len); + //memcpy(filename, Cmd, len); fnameptr += len; - sprintf(fnameptr, ".eml"); - + sprintf(fnameptr, ".eml"); + // open file f = fopen(filename, "r"); if (f == NULL) { PrintAndLog("File not found or locked."); return 1; } - + blockNum = 0; while(!feof(f)){ - + memset(buf, 0, sizeof(buf)); - + if (fgets(buf, sizeof(buf), f) == NULL) { fclose(f); PrintAndLog("File reading error."); @@ -1876,21 +2064,25 @@ int CmdHF14AMfCLoad(const char *Cmd) if (blockNum == 0) flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; // switch on field and send magic sequence if (blockNum == 1) flags = 0; // just write - if (blockNum == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field. + if (blockNum == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field. + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; if (mfCSetBlock(blockNum, buf8, NULL, 0, flags)) { PrintAndLog("Can't set magic card block: %d", blockNum); fclose(f); return 3; } blockNum++; - - if (blockNum >= 16 * 4) break; // magic card type - mifare 1K + + if (blockNum >= numblock) break; // magic card type - mifare 1K 64 blocks, mifare 4k 256 blocks } fclose(f); - - if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){ - PrintAndLog("File content error. There must be 64 blocks"); + + //if (blockNum != 16 * 4 && blockNum != 32 * 4 + 8 * 16){ + if (blockNum != numblock){ + PrintAndLog("File content error. There must be %d blocks", numblock); return 4; } PrintAndLog("Loaded from file: %s", filename); @@ -1902,7 +2094,7 @@ int CmdHF14AMfCLoad(const char *Cmd) int CmdHF14AMfCGetBlk(const char *Cmd) { uint8_t memBlock[16]; uint8_t blockNo = 0; - int res; + int res, gen = 0; memset(memBlock, 0x00, sizeof(memBlock)); if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { @@ -1910,55 +2102,77 @@ int CmdHF14AMfCGetBlk(const char *Cmd) { PrintAndLog("sample: hf mf cgetblk 1"); PrintAndLog("Get block data from magic Chinese card (only works with such cards)\n"); return 0; - } + } + + gen = mfCIdentify(); blockNo = param_get8(Cmd, 0); PrintAndLog("--block number:%2d ", blockNo); - res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER); + if (gen == 2) { + /* generation 1b magic card */ + res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER | CSETBLOCK_MAGIC_1B); + } else { + /* generation 1a magic card by default */ + res = mfCGetBlock(blockNo, memBlock, CSETBLOCK_SINGLE_OPER); + } if (res) { PrintAndLog("Can't read block. error=%d", res); return 1; } - + PrintAndLog("block data:%s", sprint_hex(memBlock, 16)); return 0; } - int CmdHF14AMfCGetSc(const char *Cmd) { uint8_t memBlock[16] = {0x00}; uint8_t sectorNo = 0; - int i, res, flags; + int i, res, flags, gen = 0, baseblock = 0, sect_size = 4; if (strlen(Cmd) < 1 || param_getchar(Cmd, 0) == 'h') { PrintAndLog("Usage: hf mf cgetsc "); PrintAndLog("sample: hf mf cgetsc 0"); PrintAndLog("Get sector data from magic Chinese card (only works with such cards)\n"); return 0; - } + } sectorNo = param_get8(Cmd, 0); - if (sectorNo > 15) { - PrintAndLog("Sector number must be in [0..15] as in MIFARE classic."); + + if (sectorNo > 39) { + PrintAndLog("Sector number must be in [0..15] in MIFARE classic 1k and [0..39] in MIFARE classic 4k."); return 1; } PrintAndLog("--sector number:%d ", sectorNo); + gen = mfCIdentify(); + flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; - for (i = 0; i < 4; i++) { + if (sectorNo < 32 ) { + baseblock = sectorNo * 4; + } else { + baseblock = 128 + 16 * (sectorNo - 32); + + } + if (sectorNo > 31) sect_size = 16; + + for (i = 0; i < sect_size; i++) { if (i == 1) flags = 0; - if (i == 3) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; + if (i == sect_size - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; + + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; - res = mfCGetBlock(sectorNo * 4 + i, memBlock, flags); + res = mfCGetBlock(baseblock + i, memBlock, flags); if (res) { - PrintAndLog("Can't read block. %d error=%d", sectorNo * 4 + i, res); + PrintAndLog("Can't read block. %d error=%d", baseblock + i, res); return 1; } - - PrintAndLog("block %3d data:%s", sectorNo * 4 + i, sprint_hex(memBlock, 16)); + + PrintAndLog("block %3d data:%s", baseblock + i, sprint_hex(memBlock, 16)); } return 0; } @@ -1970,37 +2184,50 @@ int CmdHF14AMfCSave(const char *Cmd) { char filename[FILE_PATH_SIZE] = {0x00}; char * fnameptr = filename; uint8_t fillFromEmulator = 0; - uint8_t buf[64] = {0x00}; - int i, j, len, flags; - + uint8_t buf[256] = {0x00}; + int i, j, len, flags, gen = 0, numblock = 64; + // memset(filename, 0, sizeof(filename)); // memset(buf, 0, sizeof(buf)); if (param_getchar(Cmd, 0) == 'h') { PrintAndLog("It saves `magic Chinese` card dump into the file `filename.eml` or `cardID.eml`"); - PrintAndLog("or into emulator memory (option `e`)"); - PrintAndLog("Usage: hf mf esave [file name w/o `.eml`][e]"); - PrintAndLog(" sample: hf mf esave "); - PrintAndLog(" hf mf esave filename"); - PrintAndLog(" hf mf esave e \n"); + PrintAndLog("or into emulator memory (option `e`). 4K card: (option `4`)"); + PrintAndLog("Usage: hf mf csave [file name w/o `.eml`][e][4]"); + PrintAndLog("Sample: hf mf csave "); + PrintAndLog(" hf mf csave filename"); + PrintAndLog(" hf mf csave e"); + PrintAndLog(" hf mf csave 4"); + PrintAndLog(" hf mf csave filename 4"); + PrintAndLog(" hf mf csave e 4"); return 0; - } + } char ctmp = param_getchar(Cmd, 0); if (ctmp == 'e' || ctmp == 'E') fillFromEmulator = 1; + if (ctmp == '4') numblock = 256; + ctmp = param_getchar(Cmd, 1); + if (ctmp == '4') numblock = 256; + + gen = mfCIdentify(); + PrintAndLog("Saving magic mifare %dK", numblock == 256 ? 4:1); if (fillFromEmulator) { // put into emulator flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; - for (i = 0; i < 16 * 4; i++) { + for (i = 0; i < numblock; i++) { if (i == 1) flags = 0; - if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; - + if (i == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; + + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; + if (mfCGetBlock(i, buf, flags)) { PrintAndLog("Cant get block: %d", i); break; } - + if (mfEmlSetMem(buf, i, 1)) { PrintAndLog("Cant set emul block: %d", i); return 3; @@ -2008,27 +2235,35 @@ int CmdHF14AMfCSave(const char *Cmd) { } return 0; } else { - len = strlen(Cmd); + param_getstr(Cmd, 0, filename); + + len = strlen(filename); if (len > FILE_PATH_SIZE - 5) len = FILE_PATH_SIZE - 5; - - if (len < 1) { + + ctmp = param_getchar(Cmd, 0); + if (len < 1 || (ctmp == '4')) { // get filename - if (mfCGetBlock(0, buf, CSETBLOCK_SINGLE_OPER)) { + + flags = CSETBLOCK_SINGLE_OPER; + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; + if (mfCGetBlock(0, buf, flags)) { PrintAndLog("Cant get block: %d", 0); len = sprintf(fnameptr, "dump"); fnameptr += len; } else { for (j = 0; j < 7; j++, fnameptr += 2) - sprintf(fnameptr, "%02x", buf[j]); + sprintf(fnameptr, "%02x", buf[j]); } } else { - memcpy(filename, Cmd, len); + //memcpy(filename, Cmd, len); fnameptr += len; } - sprintf(fnameptr, ".eml"); - + sprintf(fnameptr, ".eml"); + // open file f = fopen(filename, "w+"); @@ -2039,22 +2274,25 @@ int CmdHF14AMfCSave(const char *Cmd) { // put hex flags = CSETBLOCK_INIT_FIELD + CSETBLOCK_WUPC; - for (i = 0; i < 16 * 4; i++) { + for (i = 0; i < numblock; i++) { if (i == 1) flags = 0; - if (i == 16 * 4 - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; - + if (i == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; + + if (gen == 2) + /* generation 1b magic card */ + flags |= CSETBLOCK_MAGIC_1B; if (mfCGetBlock(i, buf, flags)) { PrintAndLog("Cant get block: %d", i); break; } for (j = 0; j < 16; j++) - fprintf(f, "%02x", buf[j]); + fprintf(f, "%02x", buf[j]); fprintf(f,"\n"); } fclose(f); - + PrintAndLog("Saved to file: %s", filename); - + return 0; } } @@ -2067,7 +2305,7 @@ int CmdHF14AMfSniff(const char *Cmd){ //bool wantSaveToEml = 0; TODO bool wantSaveToEmlFile = 0; - //var + //var int res = 0; int len = 0; int blockLen = 0; @@ -2081,7 +2319,7 @@ int CmdHF14AMfSniff(const char *Cmd){ uint8_t *buf = NULL; uint16_t bufsize = 0; uint8_t *bufPtr = NULL; - + char ctmp = param_getchar(Cmd, 0); if ( ctmp == 'h' || ctmp == 'H' ) { PrintAndLog("It continuously gets data from the field and saves it to: log, emulator, emulator file."); @@ -2093,8 +2331,8 @@ int CmdHF14AMfSniff(const char *Cmd){ PrintAndLog("Usage: hf mf sniff [l][d][e][f]"); PrintAndLog(" sample: hf mf sniff l d e"); return 0; - } - + } + for (int i = 0; i < 4; i++) { ctmp = param_getchar(Cmd, i); if (ctmp == 'l' || ctmp == 'L') wantLogToFile = true; @@ -2102,7 +2340,7 @@ int CmdHF14AMfSniff(const char *Cmd){ //if (ctmp == 'e' || ctmp == 'E') wantSaveToEml = true; TODO if (ctmp == 'f' || ctmp == 'F') wantSaveToEmlFile = true; } - + printf("-------------------------------------------------------------------------\n"); printf("Executing command. \n"); printf("Press the key on the proxmark3 device to abort both proxmark3 and client.\n"); @@ -2122,7 +2360,7 @@ int CmdHF14AMfSniff(const char *Cmd){ printf("\naborted via keyboard!\n"); break; } - + UsbCommand resp; if (WaitForResponseTimeout(CMD_ACK,&resp,2000)) { res = resp.arg[0] & 0xff; @@ -2179,24 +2417,24 @@ int CmdHF14AMfSniff(const char *Cmd){ memcpy(atqa, bufPtr + 2 + 7, 2); uid_len = (atqa[0] & 0xC0) == 0x40 ? 7 : 4; sak = bufPtr[11]; - PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", + PrintAndLog("tag select uid:%s atqa:0x%02x%02x sak:0x%02x", sprint_hex(uid + (7 - uid_len), uid_len), - atqa[1], - atqa[0], + atqa[1], + atqa[0], sak); if (wantLogToFile || wantDecrypt) { FillFileNameByUID(logHexFileName, uid + (7 - uid_len), ".log", uid_len); AddLogCurrentDT(logHexFileName); - } - if (wantDecrypt) + } + if (wantDecrypt) mfTraceInit(uid, atqa, sak, wantSaveToEmlFile); } else { PrintAndLog("%s(%d):%s", isTag ? "TAG":"RDR", num, sprint_hex(bufPtr, len)); - if (wantLogToFile) + if (wantLogToFile) AddLogHex(logHexFileName, isTag ? "TAG: ":"RDR: ", bufPtr, len); - if (wantDecrypt) + if (wantDecrypt) mfTraceDecode(bufPtr, len, wantSaveToEmlFile); - num++; + num++; } bufPtr += len; bufPtr += ((len-1)/8+1); // ignore parity @@ -2220,33 +2458,35 @@ int CmdDecryptTraceCmds(const char *Cmd){ static command_t CommandTable[] = { - {"help", CmdHelp, 1, "This help"}, - {"dbg", CmdHF14AMfDbg, 0, "Set default debug mode"}, - {"rdbl", CmdHF14AMfRdBl, 0, "Read MIFARE classic block"}, - {"rdsc", CmdHF14AMfRdSc, 0, "Read MIFARE classic sector"}, - {"dump", CmdHF14AMfDump, 0, "Dump MIFARE classic tag to binary file"}, - {"restore", CmdHF14AMfRestore, 0, "Restore MIFARE classic binary file to BLANK tag"}, - {"wrbl", CmdHF14AMfWrBl, 0, "Write MIFARE classic block"}, - {"chk", CmdHF14AMfChk, 0, "Test block keys"}, - {"mifare", CmdHF14AMifare, 0, "Read parity error messages."}, - {"nested", CmdHF14AMfNested, 0, "Test nested authentication"}, - {"sniff", CmdHF14AMfSniff, 0, "Sniff card-reader communication"}, - {"sim", CmdHF14AMf1kSim, 0, "Simulate MIFARE card"}, - {"eclr", CmdHF14AMfEClear, 0, "Clear simulator memory block"}, - {"eget", CmdHF14AMfEGet, 0, "Get simulator memory block"}, - {"eset", CmdHF14AMfESet, 0, "Set simulator memory block"}, - {"eload", CmdHF14AMfELoad, 0, "Load from file emul dump"}, - {"esave", CmdHF14AMfESave, 0, "Save to file emul dump"}, - {"ecfill", CmdHF14AMfECFill, 0, "Fill simulator memory with help of keys from simulator"}, - {"ekeyprn", CmdHF14AMfEKeyPrn, 0, "Print keys from simulator memory"}, - {"csetuid", CmdHF14AMfCSetUID, 0, "Set UID for magic Chinese card"}, - {"csetblk", CmdHF14AMfCSetBlk, 0, "Write block - Magic Chinese card"}, - {"cgetblk", CmdHF14AMfCGetBlk, 0, "Read block - Magic Chinese card"}, - {"cgetsc", CmdHF14AMfCGetSc, 0, "Read sector - Magic Chinese card"}, - {"cload", CmdHF14AMfCLoad, 0, "Load dump into magic Chinese card"}, - {"csave", CmdHF14AMfCSave, 0, "Save dump from magic Chinese card into file or emulator"}, - {"decrypt", CmdDecryptTraceCmds,1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"}, - {NULL, NULL, 0, NULL} + {"help", CmdHelp, 1, "This help"}, + {"dbg", CmdHF14AMfDbg, 0, "Set default debug mode"}, + {"rdbl", CmdHF14AMfRdBl, 0, "Read MIFARE classic block"}, + {"rdsc", CmdHF14AMfRdSc, 0, "Read MIFARE classic sector"}, + {"dump", CmdHF14AMfDump, 0, "Dump MIFARE classic tag to binary file"}, + {"restore", CmdHF14AMfRestore, 0, "Restore MIFARE classic binary file to BLANK tag"}, + {"wrbl", CmdHF14AMfWrBl, 0, "Write MIFARE classic block"}, + {"chk", CmdHF14AMfChk, 0, "Test block keys"}, + {"mifare", CmdHF14AMifare, 0, "Read parity error messages."}, + {"hardnested", CmdHF14AMfNestedHard, 0, "Nested attack for hardened Mifare cards"}, + {"nested", CmdHF14AMfNested, 0, "Test nested authentication"}, + {"sniff", CmdHF14AMfSniff, 0, "Sniff card-reader communication"}, + {"sim", CmdHF14AMf1kSim, 0, "Simulate MIFARE card"}, + {"eclr", CmdHF14AMfEClear, 0, "Clear simulator memory block"}, + {"eget", CmdHF14AMfEGet, 0, "Get simulator memory block"}, + {"eset", CmdHF14AMfESet, 0, "Set simulator memory block"}, + {"eload", CmdHF14AMfELoad, 0, "Load from file emul dump"}, + {"esave", CmdHF14AMfESave, 0, "Save to file emul dump"}, + {"ecfill", CmdHF14AMfECFill, 0, "Fill simulator memory with help of keys from simulator"}, + {"ekeyprn", CmdHF14AMfEKeyPrn, 0, "Print keys from simulator memory"}, + {"cwipe", CmdHF14AMfCWipe, 0, "Wipe magic Chinese card"}, + {"csetuid", CmdHF14AMfCSetUID, 0, "Set UID for magic Chinese card"}, + {"csetblk", CmdHF14AMfCSetBlk, 0, "Write block - Magic Chinese card"}, + {"cgetblk", CmdHF14AMfCGetBlk, 0, "Read block - Magic Chinese card"}, + {"cgetsc", CmdHF14AMfCGetSc, 0, "Read sector - Magic Chinese card"}, + {"cload", CmdHF14AMfCLoad, 0, "Load dump into magic Chinese card"}, + {"csave", CmdHF14AMfCSave, 0, "Save dump from magic Chinese card into file or emulator"}, + {"decrypt", CmdDecryptTraceCmds, 1, "[nt] [ar_enc] [at_enc] [data] - to decrypt snoop or trace"}, + {NULL, NULL, 0, NULL} }; int CmdHFMF(const char *Cmd)