From a39af1cb9cab6298fcf01d7243e9f48db0f45f26 Mon Sep 17 00:00:00 2001
From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Wed, 22 May 2019 19:02:58 +0200
Subject: [PATCH] Add: new option 'd' in 'hf mf ekeyprn' to create dumpkeys.bin
from emulator memory (#822)
(and whitespace fixes)
---
client/cmdhfmf.c | 636 +++++++++++++++++++++++++----------------------
1 file changed, 334 insertions(+), 302 deletions(-)
diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c
index 903e8575..9284d14c 100644
--- a/client/cmdhfmf.c
+++ b/client/cmdhfmf.c
@@ -34,7 +34,7 @@
#include "mifare/ndef.h"
#include "emv/dump.h"
-#define NESTED_SECTOR_RETRY 10 // how often we try mfested() until we give up
+#define NESTED_SECTOR_RETRY 10 // how often we try mfested() until we give up
static int CmdHelp(const char *Cmd);
@@ -65,7 +65,7 @@ int CmdHF14AMfWrBl(const char *Cmd)
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;
+ char cmdp = 0x00;
if (strlen(Cmd)<3) {
PrintAndLog("Usage: hf mf wrbl <block number> <key A/B> <key (12 hex symbols)> <block data (32 hex symbols)>");
@@ -113,7 +113,7 @@ int CmdHF14AMfRdBl(const char *Cmd)
uint8_t keyType = 0;
uint8_t key[6] = {0, 0, 0, 0, 0, 0};
- char cmdp = 0x00;
+ char cmdp = 0x00;
if (strlen(Cmd)<3) {
@@ -177,7 +177,7 @@ int CmdHF14AMfRdSc(const char *Cmd)
uint8_t key[6] = {0, 0, 0, 0, 0, 0};
uint8_t isOK = 0;
uint8_t *data = NULL;
- char cmdp = 0x00;
+ char cmdp = 0x00;
if (strlen(Cmd)<3) {
PrintAndLog("Usage: hf mf rdsc <sector number> <key A/B> <key (12 hex symbols)>");
@@ -218,15 +218,15 @@ int CmdHF14AMfRdSc(const char *Cmd)
PrintAndLog("data : %s", sprint_hex(data + i * 16, 16));
}
PrintAndLog("trailer: %s", sprint_hex(data + (sectorNo<32?3:15) * 16, 16));
-
+
PrintAndLogEx(NORMAL, "Trailer decoded:");
- int bln = mfFirstBlockOfSector(sectorNo);
- int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
- for (i = 0; i < 4; i++) {
- PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &(data + (sectorNo<32?3:15) * 16)[6]));
- bln += blinc;
- }
- PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&(data + (sectorNo<32?3:15) * 16)[9], 1));
+ int bln = mfFirstBlockOfSector(sectorNo);
+ int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
+ for (i = 0; i < 4; i++) {
+ PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &(data + (sectorNo<32?3:15) * 16)[6]));
+ bln += blinc;
+ }
+ PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&(data + (sectorNo<32?3:15) * 16)[9], 1));
}
} else {
PrintAndLog("Command execute timeout");
@@ -324,7 +324,7 @@ int CmdHF14AMfDump(const char *Cmd)
fclose(fin);
return 2;
}
- }
+ }
}
fclose(fin);
@@ -371,7 +371,7 @@ int CmdHF14AMfDump(const char *Cmd)
for (blockNo = 0; isOK && blockNo < NumBlocksPerSector(sectorNo); blockNo++) {
bool received = false;
for (tries = 0; tries < 3; tries++) {
- if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A.
+ if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. At least the Access Conditions can always be read with key A.
UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
memcpy(c.d.asBytes, keys[0][sectorNo], 6);
SendCommand(&c);
@@ -387,14 +387,14 @@ int CmdHF14AMfDump(const char *Cmd)
// Don't try the other one on success.
if (resp.arg[0] & 0xff) break;
}
- } else { // data block. Check if it can be read with key A or key B
+ } else { // data block. Check if it can be read with key A or key B
uint8_t data_area = sectorNo<32?blockNo:blockNo/5;
- if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work
+ if ((rights[sectorNo][data_area] == 0x03) || (rights[sectorNo][data_area] == 0x05)) { // only key B would work
UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 1, 0}};
memcpy(c.d.asBytes, keys[1][sectorNo], 6);
SendCommand(&c);
received = WaitForResponseTimeout(CMD_ACK,&resp,1500);
- } else if (rights[sectorNo][data_area] == 0x07) { // no key would work
+ } else if (rights[sectorNo][data_area] == 0x07) { // no key would work
PrintAndLog("Access rights do not allow reading of sector %2d block %3d", sectorNo, blockNo);
if (nullMissingKeys) {
memset(resp.d.asBytes, 0, 16);
@@ -405,7 +405,7 @@ int CmdHF14AMfDump(const char *Cmd)
isOK = false;
tries = 2;
}
- } else { // key A would work
+ } else { // key A would work
UsbCommand c = {CMD_MIFARE_READBL, {FirstBlockOfSector(sectorNo) + blockNo, 0, 0}};
memcpy(c.d.asBytes, keys[0][sectorNo], 6);
SendCommand(&c);
@@ -421,13 +421,13 @@ int CmdHF14AMfDump(const char *Cmd)
if (received) {
isOK = resp.arg[0] & 0xff;
uint8_t *data = resp.d.asBytes;
- if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. Fill in the keys.
+ if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer. Fill in the keys.
memcpy(data, keys[0][sectorNo], 6);
memcpy(data + 10, keys[1][sectorNo], 6);
}
if (isOK) {
memcpy(carddata[FirstBlockOfSector(sectorNo) + blockNo], data, 16);
- PrintAndLog("Successfully read block %2d of sector %2d.", blockNo, sectorNo);
+ PrintAndLog("Successfully read block %2d of sector %2d.", blockNo, sectorNo);
} else {
PrintAndLog("Could not read block %2d of sector %2d", blockNo, sectorNo);
break;
@@ -530,7 +530,7 @@ int CmdHF14AMfRestore(const char *Cmd)
return 2;
}
- if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer
+ if (blockNo == NumBlocksPerSector(sectorNo) - 1) { // sector trailer
bldata[0] = (keyA[sectorNo][0]);
bldata[1] = (keyA[sectorNo][1]);
bldata[2] = (keyA[sectorNo][2]);
@@ -573,7 +573,7 @@ static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, boo
int len = param_getlength(Cmd, indx);
if (len > 0 && len < 4){
param_getstr(Cmd, indx, ctmp3, sizeof(ctmp3));
-
+
*paramT |= (ctmp3[0] == 't' || ctmp3[0] == 'T');
*paramD |= (ctmp3[0] == 'd' || ctmp3[0] == 'D');
bool paramS1 = *paramT || *paramD;
@@ -581,7 +581,7 @@ static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, boo
// slow and very slow
if (ctmp3[0] == 's' || ctmp3[0] == 'S' || ctmp3[1] == 's' || ctmp3[1] == 'S') {
*timeout = 11; // slow
-
+
if (!paramS1 && (ctmp3[1] == 's' || ctmp3[1] == 'S')) {
*timeout = 53; // very slow
}
@@ -606,7 +606,7 @@ int CmdHF14AMfNested(const char *Cmd)
uint64_t key64 = 0;
// timeout in units. (ms * 106)/10 or us*0.0106
uint8_t btimeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default
-
+
bool autosearchKey = false;
bool transferToEml = false;
@@ -647,14 +647,14 @@ int CmdHF14AMfNested(const char *Cmd)
} else {
SectorsCnt = ParamCardSizeSectors(cmdp);
}
-
+
// <block number>. number or autosearch key (*)
if (param_getchar(Cmd, 1) == '*') {
autosearchKey = true;
parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);
- PrintAndLog("--nested. sectors:%2d, block no:*, eml:%c, dmp=%c checktimeout=%d us",
+ PrintAndLog("--nested. sectors:%2d, block no:*, eml:%c, dmp=%c checktimeout=%d us",
SectorsCnt, transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);
} else {
blockNo = param_get8(Cmd, 1);
@@ -681,7 +681,7 @@ int CmdHF14AMfNested(const char *Cmd)
}
// one sector nested
- if (cmdp == 'o') {
+ if (cmdp == 'o') {
trgBlockNo = param_get8(Cmd, 4);
ctmp = param_getchar(Cmd, 5);
@@ -697,7 +697,7 @@ int CmdHF14AMfNested(const char *Cmd)
parseParamTDS(Cmd, 4, &transferToEml, &createDumpFile, &btimeout14a);
}
- PrintAndLog("--nested. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",
+ PrintAndLog("--nested. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",
SectorsCnt, blockNo, keyType?'B':'A', transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);
}
@@ -721,9 +721,9 @@ int CmdHF14AMfNested(const char *Cmd)
// transfer key to the emulator
if (transferToEml) {
uint8_t sectortrailer;
- if (trgBlockNo < 32*4) { // 4 block sector
+ if (trgBlockNo < 32*4) { // 4 block sector
sectortrailer = trgBlockNo | 0x03;
- } else { // 16 block sector
+ } else { // 16 block sector
sectortrailer = trgBlockNo | 0x0f;
}
mfEmlGetMem(keyBlock, sectortrailer, 1);
@@ -753,7 +753,7 @@ int CmdHF14AMfNested(const char *Cmd)
PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);
mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, MifareDefaultKeysSize, keyBlock, e_sector);
-
+
// get known key from array
bool keyFound = false;
if (autosearchKey) {
@@ -769,7 +769,7 @@ int CmdHF14AMfNested(const char *Cmd)
}
}
if (keyFound) break;
- }
+ }
// Can't found a key....
if (!keyFound) {
@@ -810,7 +810,7 @@ int CmdHF14AMfNested(const char *Cmd)
PrintAndLog("Found valid key:%012" PRIx64, key64);
e_sector[sectorNo].foundKey[trgKeyType] = 1;
e_sector[sectorNo].Key[trgKeyType] = key64;
-
+
// try to check this key as a key to the other sectors
mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, 1, keyBlock, e_sector);
}
@@ -821,7 +821,7 @@ int CmdHF14AMfNested(const char *Cmd)
// print nested statistic
PrintAndLog("\n\n-----------------------------------------------\nNested statistic:\nIterations count: %d", iterations);
PrintAndLog("Time in nested: %1.3f (%1.3f sec per key)", ((float)(msclock() - msclock1))/1000.0, ((float)(msclock() - msclock1))/iterations/1000.0);
-
+
// print result
PrintAndLog("|---|----------------|---|----------------|---|");
PrintAndLog("|sec|key A |res|key B |res|");
@@ -990,7 +990,7 @@ int CmdHF14AMfNestedHard(const char *Cmd)
i++;
}
}
-
+
SetSIMDInstr(SIMD_AUTO);
if (iindx > 0) {
while ((ctmp = param_getchar(Cmd, iindx))) {
@@ -1020,7 +1020,7 @@ int CmdHF14AMfNestedHard(const char *Cmd)
}
}
iindx++;
- }
+ }
}
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 ",
@@ -1072,8 +1072,8 @@ int CmdHF14AMfChk(const char *Cmd)
uint16_t stKeyBlock = 20;
int i, res;
- int keycnt = 0;
- char ctmp = 0x00;
+ int keycnt = 0;
+ char ctmp = 0x00;
int clen = 0;
uint8_t blockNo = 0;
uint8_t SectorsCnt = 0;
@@ -1085,7 +1085,7 @@ int CmdHF14AMfChk(const char *Cmd)
bool transferToEml = 0;
bool createDumpFile = 0;
-
+
sector_t *e_sector = NULL;
keyBlock = calloc(stKeyBlock, 6);
@@ -1123,12 +1123,12 @@ int CmdHF14AMfChk(const char *Cmd)
}
parseParamTDS(Cmd, 2, &transferToEml, &createDumpFile, &btimeout14a);
-
+
param3InUse = transferToEml | createDumpFile | (btimeout14a != MF_CHKKEYS_DEFTIMEOUT);
- PrintAndLog("--chk keys. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",
+ PrintAndLog("--chk keys. sectors:%2d, block no:%3d, key type:%c, eml:%c, dmp=%c checktimeout=%d us",
SectorsCnt, blockNo, keyType?'B':'A', transferToEml?'y':'n', createDumpFile?'y':'n', ((int)btimeout14a * 10000) / 106);
-
+
for (i = param3InUse; param_getchar(Cmd, 2 + i); i++) {
if (!param_gethex(Cmd, 2 + i, keyBlock + 6 * keycnt, 12)) {
if ( stKeyBlock - keycnt < 2) {
@@ -1142,7 +1142,7 @@ int CmdHF14AMfChk(const char *Cmd)
}
PrintAndLog("chk key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
(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);
+ (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);
keycnt++;
} else {
// May be a dic file
@@ -1159,7 +1159,7 @@ int CmdHF14AMfChk(const char *Cmd)
while (fgetc(f) != '\n' && !feof(f)) ; //goto next line
- if( buf[0]=='#' ) continue; //The line start with # is comment, skip
+ if( buf[0]=='#' ) continue; //The line start with # is comment, skip
if (!isxdigit((unsigned char)buf[0])){
PrintAndLog("File content error. '%s' must include 12 HEX symbols",buf);
@@ -1200,7 +1200,7 @@ int CmdHF14AMfChk(const char *Cmd)
for (;keycnt < defaultKeysSize; keycnt++)
PrintAndLog("chk default key[%2d] %02x%02x%02x%02x%02x%02x", keycnt,
(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);
+ (keyBlock + 6*keycnt)[3], (keyBlock + 6*keycnt)[4], (keyBlock + 6*keycnt)[5], 6);
}
// initialize storage for found keys
@@ -1245,7 +1245,7 @@ int CmdHF14AMfChk(const char *Cmd)
for (uint32_t c = 0; c < keycnt; c+=max_keys) {
uint32_t size = keycnt-c > max_keys ? max_keys : keycnt-c;
- res = mfCheckKeys(blockNo, keyAB & 0x01, true, size, &keyBlock[6 * c], &key64);
+ res = mfCheckKeys(blockNo, keyAB & 0x01, true, size, &keyBlock[6 * c], &key64);
if (res != 1) {
if (!res) {
@@ -1258,7 +1258,7 @@ int CmdHF14AMfChk(const char *Cmd)
}
} while(--keyAB > 0);
}
-
+
// print result
if (foundAKey) {
if (SectorsCnt) {
@@ -1275,8 +1275,8 @@ int CmdHF14AMfChk(const char *Cmd)
} else {
PrintAndLog("");
PrintAndLog("No valid keys found.");
- }
-
+ }
+
if (transferToEml) {
uint8_t block[16];
for (uint16_t sectorNo = 0; sectorNo < SectorsCnt; sectorNo++) {
@@ -1320,7 +1320,7 @@ int CmdHF14AMfChk(const char *Cmd)
void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack) {
#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)
+ // cannot be more than 7 or it will overrun c.d.asBytes(512)
uint64_t key = 0;
typedef struct {
uint64_t keyA;
@@ -1329,7 +1329,7 @@ void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack
st_t sector_trailer[ATTACK_KEY_COUNT];
memset(sector_trailer, 0x00, sizeof(sector_trailer));
- uint8_t stSector[ATTACK_KEY_COUNT];
+ uint8_t stSector[ATTACK_KEY_COUNT];
memset(stSector, 0x00, sizeof(stSector));
uint8_t key_cnt[ATTACK_KEY_COUNT];
memset(key_cnt, 0x00, sizeof(key_cnt));
@@ -1392,7 +1392,7 @@ void readerAttack(nonces_t ar_resp[], bool setEmulatorMem, bool doStandardAttack
if (setEmulatorMem) {
for (uint8_t i = 0; i<ATTACK_KEY_COUNT; i++) {
if (key_cnt[i]>0) {
- uint8_t memBlock[16];
+ uint8_t memBlock[16];
memset(memBlock, 0x00, sizeof(memBlock));
char cmd1[36];
memset(cmd1,0x00,sizeof(cmd1));
@@ -1463,7 +1463,7 @@ int CmdHF14AMfSim(const char *Cmd) {
while(param_getchar(Cmd, cmdp) != 0x00) {
switch(param_getchar(Cmd, cmdp)) {
- case '*':
+ case '*':
cardsize = param_getchar(Cmd + 1, cmdp);
switch(cardsize) {
case '0':
@@ -1580,7 +1580,7 @@ int CmdHF14AMfSim(const char *Cmd) {
cardsize == '2' ? "2K" :
cardsize == '4' ? "4K" : "1K",
flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):
- flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): "N/A",
+ flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): "N/A",
exitAfterNReads,
flags,
flags);
@@ -1615,7 +1615,7 @@ int CmdHF14AMfSim(const char *Cmd) {
cardsize == '2' ? "2K" :
cardsize == '4' ? "4K" : "1K",
flags & FLAG_4B_UID_IN_DATA ? sprint_hex(uid,4):
- flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): "N/A",
+ flags & FLAG_7B_UID_IN_DATA ? sprint_hex(uid,7): "N/A",
exitAfterNReads,
flags,
flags);
@@ -1951,31 +1951,37 @@ int CmdHF14AMfECFill(const char *Cmd)
return 0;
}
+
int CmdHF14AMfEKeyPrn(const char *Cmd)
{
int i;
- uint8_t numSectors;
+ uint8_t numSectors = 16;
uint8_t data[16];
uint64_t keyA, keyB;
+ bool createDumpFile = false;
if (param_getchar(Cmd, 0) == 'h') {
PrintAndLog("It prints the keys loaded in the emulator memory");
- PrintAndLog("Usage: hf mf ekeyprn [card memory]");
+ PrintAndLog("Usage: hf mf ekeyprn [card memory] [d]");
PrintAndLog(" [card memory]: 0 = 320 bytes (Mifare Mini), 1 = 1K (default), 2 = 2K, 4 = 4K");
+ PrintAndLog(" [d] : write keys to binary file dumpkeys.bin");
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 '\0': numSectors = 16; break;
- case '2' : numSectors = 32; break;
- case '4' : numSectors = 40; break;
- default: numSectors = 16;
+ uint8_t cmdp = 0;
+ while (param_getchar(Cmd, cmdp) != 0x00) {
+ switch (param_getchar(Cmd, cmdp)) {
+ case '0' : numSectors = 5; break;
+ case '1' :
+ case '\0': numSectors = 16; break;
+ case '2' : numSectors = 32; break;
+ case '4' : numSectors = 40; break;
+ case 'd' :
+ case 'D' : createDumpFile = true; break;
+ }
+ cmdp++;
}
PrintAndLog("|---|----------------|----------------|");
@@ -1992,9 +1998,35 @@ int CmdHF14AMfEKeyPrn(const char *Cmd)
}
PrintAndLog("|---|----------------|----------------|");
+ // Create dump file
+ if (createDumpFile) {
+ FILE *fkeys;
+ if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) {
+ PrintAndLog("Could not create file dumpkeys.bin");
+ return 1;
+ }
+ PrintAndLog("Printing keys to binary file dumpkeys.bin...");
+ for(i = 0; i < numSectors; i++) {
+ if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {
+ PrintAndLog("error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
+ break;
+ }
+ fwrite(data+6, 1, 6, fkeys);
+ }
+ for(i = 0; i < numSectors; i++) {
+ if (mfEmlGetMem(data, FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1, 1)) {
+ PrintAndLog("error get block %d", FirstBlockOfSector(i) + NumBlocksPerSector(i) - 1);
+ break;
+ }
+ fwrite(data+10, 1, 6, fkeys);
+ }
+ fclose(fkeys);
+ }
+
return 0;
}
+
int CmdHF14AMfCSetUID(const char *Cmd)
{
uint8_t uid[8] = {0x00};
@@ -2006,7 +2038,7 @@ int CmdHF14AMfCSetUID(const char *Cmd)
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;
@@ -2015,12 +2047,12 @@ int CmdHF14AMfCSetUID(const char *Cmd)
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;
@@ -2074,7 +2106,7 @@ int CmdHF14AMfCWipe(const char *Cmd)
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] [f]");
PrintAndLog("sample: hf mf cwipe 1 w f");
@@ -2085,9 +2117,9 @@ int CmdHF14AMfCWipe(const char *Cmd)
}
gen = mfCIdentify();
- if ((gen != 1) && (gen != 2))
+ if ((gen != 1) && (gen != 2))
return 1;
-
+
numBlocks = ParamCardSizeBlocks(param_getchar(Cmd, 0));
char cmdp = 0;
@@ -2107,7 +2139,7 @@ int CmdHF14AMfCWipe(const char *Cmd)
cmdp++;
}
- if (!wipeCard && !fillCard)
+ if (!wipeCard && !fillCard)
wipeCard = true;
PrintAndLog("--blocks count:%2d wipe:%c fill:%c", numBlocks, (wipeCard)?'y':'n', (fillCard)?'y':'n');
@@ -2117,10 +2149,10 @@ int CmdHF14AMfCWipe(const char *Cmd)
if (wipeCard) {
PrintAndLog("WARNING: can't wipe magic card 1b generation");
}
- res = mfCWipe(numBlocks, true, false, fillCard);
+ res = mfCWipe(numBlocks, true, false, fillCard);
} else {
/* generation 1a magic card by default */
- res = mfCWipe(numBlocks, false, wipeCard, fillCard);
+ res = mfCWipe(numBlocks, false, wipeCard, fillCard);
}
if (res) {
@@ -2147,7 +2179,7 @@ int CmdHF14AMfCSetBlk(const char *Cmd)
}
gen = mfCIdentify();
- if ((gen != 1) && (gen != 2))
+ if ((gen != 1) && (gen != 2))
return 1;
blockNo = param_get8(Cmd, 0);
@@ -2213,9 +2245,9 @@ int CmdHF14AMfCLoad(const char *Cmd)
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 == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field.
+ 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 == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Magic Halt and switch off field.
if (gen == 2)
/* generation 1b magic card */
@@ -2265,9 +2297,9 @@ int CmdHF14AMfCLoad(const char *Cmd)
for (i = 0; i < 32; i += 2)
sscanf(&buf[i], "%02x", (unsigned int *)&buf8[i / 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 == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field.
+ 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 == numblock - 1) flags = CSETBLOCK_HALT + CSETBLOCK_RESET_FIELD; // Done. Switch off field.
if (gen == 2)
/* generation 1b magic card */
@@ -2326,7 +2358,7 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
}
PrintAndLog("block data:%s", sprint_hex(memBlock, 16));
-
+
if (mfIsSectorTrailer(blockNo)) {
PrintAndLogEx(NORMAL, "Trailer decoded:");
PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(memBlock, 6));
@@ -2339,7 +2371,7 @@ int CmdHF14AMfCGetBlk(const char *Cmd) {
}
PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&memBlock[9], 1));
}
-
+
return 0;
}
@@ -2390,19 +2422,19 @@ int CmdHF14AMfCGetSc(const char *Cmd) {
}
PrintAndLog("block %3d data:%s", baseblock + i, sprint_hex(memBlock, 16));
-
+
if (mfIsSectorTrailer(baseblock + i)) {
- PrintAndLogEx(NORMAL, "Trailer decoded:");
- PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(memBlock, 6));
- PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&memBlock[10], 6));
- int bln = baseblock;
- int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
- for (int i = 0; i < 4; i++) {
- PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &memBlock[6]));
- bln += blinc;
- }
- PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&memBlock[9], 1));
- }
+ PrintAndLogEx(NORMAL, "Trailer decoded:");
+ PrintAndLogEx(NORMAL, "Key A: %s", sprint_hex_inrow(memBlock, 6));
+ PrintAndLogEx(NORMAL, "Key B: %s", sprint_hex_inrow(&memBlock[10], 6));
+ int bln = baseblock;
+ int blinc = (mfNumBlocksPerSector(sectorNo) > 4) ? 5 : 1;
+ for (int i = 0; i < 4; i++) {
+ PrintAndLogEx(NORMAL, "Access block %d%s: %s", bln, ((blinc > 1) && (i < 3) ? "+" : "") , mfGetAccessConditionsDesc(i, &memBlock[6]));
+ bln += blinc;
+ }
+ PrintAndLogEx(NORMAL, "UserData: %s", sprint_hex_inrow(&memBlock[9], 1));
+ }
}
return 0;
}
@@ -2599,17 +2631,17 @@ int CmdHF14AMfSniff(const char *Cmd){
uint16_t traceLen = resp.arg[1];
len = resp.arg[2];
- if (res == 0) { // we are done
+ if (res == 0) { // we are done
break;
}
- if (res == 1) { // there is (more) data to be transferred
- if (pckNum == 0) { // first packet, (re)allocate necessary buffer
+ if (res == 1) { // there is (more) data to be transferred
+ if (pckNum == 0) { // first packet, (re)allocate necessary buffer
if (traceLen > bufsize || buf == NULL) {
uint8_t *p;
- if (buf == NULL) { // not yet allocated
+ if (buf == NULL) { // not yet allocated
p = malloc(traceLen);
- } else { // need more memory
+ } else { // need more memory
p = realloc(buf, traceLen);
}
if (p == NULL) {
@@ -2628,13 +2660,13 @@ int CmdHF14AMfSniff(const char *Cmd){
pckNum++;
}
- if (res == 2) { // received all data, start displaying
+ if (res == 2) { // received all data, start displaying
blockLen = bufPtr - buf;
bufPtr = buf;
printf(">\n");
PrintAndLog("received trace len: %d packages: %d", blockLen, pckNum);
while (bufPtr - buf < blockLen) {
- bufPtr += 6; // skip (void) timing information
+ bufPtr += 6; // skip (void) timing information
len = *((uint16_t *)bufPtr);
if(len & 0x8000) {
isTag = true;
@@ -2662,11 +2694,11 @@ int CmdHF14AMfSniff(const char *Cmd){
mfTraceInit(uid, atqa, sak, wantSaveToEmlFile);
} else {
oddparitybuf(bufPtr, len, parity);
- PrintAndLog("%s(%d):%s [%s] c[%s]%c",
- isTag ? "TAG":"RDR",
- num,
- sprint_hex(bufPtr, len),
- printBitsPar(bufPtr + len, len),
+ PrintAndLog("%s(%d):%s [%s] c[%s]%c",
+ isTag ? "TAG":"RDR",
+ num,
+ sprint_hex(bufPtr, len),
+ printBitsPar(bufPtr + len, len),
printBitsPar(parity, len),
memcmp(bufPtr + len, parity, len / 8 + 1) ? '!' : ' ');
if (wantLogToFile)
@@ -2676,7 +2708,7 @@ int CmdHF14AMfSniff(const char *Cmd){
num++;
}
bufPtr += len;
- bufPtr += parlen; // ignore parity
+ bufPtr += parlen; // ignore parity
}
pckNum = 0;
}
@@ -2684,7 +2716,7 @@ int CmdHF14AMfSniff(const char *Cmd){
} // while (true)
free(buf);
-
+
msleep(300); // wait for exiting arm side.
PrintAndLog("Done.");
return 0;
@@ -2704,8 +2736,8 @@ int CmdHF14AMfAuth4(const char *cmd) {
uint8_t key[16] = {0};
int keylen = 0;
- CLIParserInit("hf mf auth4",
- "Executes AES authentication command in ISO14443-4",
+ CLIParserInit("hf mf auth4",
+ "Executes AES authentication command in ISO14443-4",
"Usage:\n\thf mf auth4 4000 000102030405060708090a0b0c0d0e0f -> executes authentication\n"
"\thf mf auth4 9003 FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> executes authentication\n");
@@ -2716,16 +2748,16 @@ int CmdHF14AMfAuth4(const char *cmd) {
arg_param_end
};
CLIExecWithReturn(cmd, argtable, true);
-
+
CLIGetHexWithReturn(1, keyn, &keynlen);
CLIGetHexWithReturn(2, key, &keylen);
CLIParserFree();
-
+
if (keynlen != 2) {
PrintAndLog("ERROR: <Key Num> must be 2 bytes long instead of: %d", keynlen);
return 1;
}
-
+
if (keylen != 16) {
PrintAndLog("ERROR: <Key Value> must be 16 bytes long instead of: %d", keylen);
return 1;
@@ -2737,196 +2769,196 @@ int CmdHF14AMfAuth4(const char *cmd) {
// https://www.nxp.com/docs/en/application-note/AN10787.pdf
int CmdHF14AMfMAD(const char *cmd) {
- CLIParserInit("hf mf mad",
- "Checks and prints Mifare Application Directory (MAD)",
- "Usage:\n\thf mf mad -> shows MAD if exists\n"
- "\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");
-
- void *argtable[] = {
- arg_param_begin,
- arg_lit0("vV", "verbose", "show technical data"),
- arg_str0("aA", "aid", "print all sectors with aid", NULL),
- arg_str0("kK", "key", "key for printing sectors", NULL),
- arg_lit0("bB", "keyb", "use key B for access printing sectors (by default: key A)"),
- arg_param_end
- };
- CLIExecWithReturn(cmd, argtable, true);
- bool verbose = arg_get_lit(1);
- uint8_t aid[2] = {0};
- int aidlen;
- CLIGetHexWithReturn(2, aid, &aidlen);
- uint8_t key[6] = {0};
- int keylen;
- CLIGetHexWithReturn(3, key, &keylen);
- bool keyB = arg_get_lit(4);
-
- CLIParserFree();
-
- if (aidlen != 2 && keylen > 0) {
- PrintAndLogEx(WARNING, "do not need a key without aid.");
- }
-
- uint8_t sector0[16 * 4] = {0};
- uint8_t sector10[16 * 4] = {0};
- if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
- PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
- return 2;
- }
-
- if (verbose) {
- for (int i = 0; i < 4; i ++)
- PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(§or0[i * 16], 16));
- }
-
- bool haveMAD2 = false;
- MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
-
- if (haveMAD2) {
- if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
- PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
- return 2;
- }
-
- MAD2DecodeAndPrint(sector10, verbose);
- }
-
- if (aidlen == 2) {
- uint16_t aaid = (aid[0] << 8) + aid[1];
- PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
-
- uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
- size_t madlen = 0;
- if (MADDecode(sector0, sector10, mad, &madlen)) {
- PrintAndLogEx(ERR, "can't decode mad.");
- return 10;
- }
-
- uint8_t akey[6] = {0};
- memcpy(akey, g_mifare_ndef_key, 6);
- if (keylen == 6) {
- memcpy(akey, key, 6);
- }
-
- for (int i = 0; i < madlen; i++) {
- if (aaid == mad[i]) {
- uint8_t vsector[16 * 4] = {0};
- if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector)) {
- PrintAndLogEx(NORMAL, "");
- PrintAndLogEx(ERR, "read sector %d error.", i + 1);
- return 2;
- }
-
- for (int j = 0; j < (verbose ? 4 : 3); j ++)
- PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));
- }
- }
- }
-
- return 0;
+ CLIParserInit("hf mf mad",
+ "Checks and prints Mifare Application Directory (MAD)",
+ "Usage:\n\thf mf mad -> shows MAD if exists\n"
+ "\thf mf mad -a 03e1 -k ffffffffffff -b -> shows NDEF data if exists. read card with custom key and key B\n");
+
+ void *argtable[] = {
+ arg_param_begin,
+ arg_lit0("vV", "verbose", "show technical data"),
+ arg_str0("aA", "aid", "print all sectors with aid", NULL),
+ arg_str0("kK", "key", "key for printing sectors", NULL),
+ arg_lit0("bB", "keyb", "use key B for access printing sectors (by default: key A)"),
+ arg_param_end
+ };
+ CLIExecWithReturn(cmd, argtable, true);
+ bool verbose = arg_get_lit(1);
+ uint8_t aid[2] = {0};
+ int aidlen;
+ CLIGetHexWithReturn(2, aid, &aidlen);
+ uint8_t key[6] = {0};
+ int keylen;
+ CLIGetHexWithReturn(3, key, &keylen);
+ bool keyB = arg_get_lit(4);
+
+ CLIParserFree();
+
+ if (aidlen != 2 && keylen > 0) {
+ PrintAndLogEx(WARNING, "do not need a key without aid.");
+ }
+
+ uint8_t sector0[16 * 4] = {0};
+ uint8_t sector10[16 * 4] = {0};
+ if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
+ PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+ return 2;
+ }
+
+ if (verbose) {
+ for (int i = 0; i < 4; i ++)
+ PrintAndLogEx(NORMAL, "[%d] %s", i, sprint_hex(§or0[i * 16], 16));
+ }
+
+ bool haveMAD2 = false;
+ MAD1DecodeAndPrint(sector0, verbose, &haveMAD2);
+
+ if (haveMAD2) {
+ if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
+ PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+ return 2;
+ }
+
+ MAD2DecodeAndPrint(sector10, verbose);
+ }
+
+ if (aidlen == 2) {
+ uint16_t aaid = (aid[0] << 8) + aid[1];
+ PrintAndLogEx(NORMAL, "\n-------------- AID 0x%04x ---------------", aaid);
+
+ uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+ size_t madlen = 0;
+ if (MADDecode(sector0, sector10, mad, &madlen)) {
+ PrintAndLogEx(ERR, "can't decode mad.");
+ return 10;
+ }
+
+ uint8_t akey[6] = {0};
+ memcpy(akey, g_mifare_ndef_key, 6);
+ if (keylen == 6) {
+ memcpy(akey, key, 6);
+ }
+
+ for (int i = 0; i < madlen; i++) {
+ if (aaid == mad[i]) {
+ uint8_t vsector[16 * 4] = {0};
+ if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, akey, vsector)) {
+ PrintAndLogEx(NORMAL, "");
+ PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+ return 2;
+ }
+
+ for (int j = 0; j < (verbose ? 4 : 3); j ++)
+ PrintAndLogEx(NORMAL, " [%03d] %s", (i + 1) * 4 + j, sprint_hex(&vsector[j * 16], 16));
+ }
+ }
+ }
+
+ return 0;
}
int CmdHFMFNDEF(const char *cmd) {
- CLIParserInit("hf mf ndef",
- "Prints NFC Data Exchange Format (NDEF)",
- "Usage:\n\thf mf ndef -> shows NDEF data\n"
- "\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");
-
- void *argtable[] = {
- arg_param_begin,
- arg_litn("vV", "verbose", 0, 2, "show technical data"),
- arg_str0("aA", "aid", "replace default aid for NDEF", NULL),
- arg_str0("kK", "key", "replace default key for NDEF", NULL),
- arg_lit0("bB", "keyb", "use key B for access sectors (by default: key A)"),
- arg_param_end
- };
- CLIExecWithReturn(cmd, argtable, true);
-
- bool verbose = arg_get_lit(1);
- bool verbose2 = arg_get_lit(1) > 1;
- uint8_t aid[2] = {0};
- int aidlen;
- CLIGetHexWithReturn(2, aid, &aidlen);
- uint8_t key[6] = {0};
- int keylen;
- CLIGetHexWithReturn(3, key, &keylen);
- bool keyB = arg_get_lit(4);
-
- CLIParserFree();
-
- uint16_t ndefAID = 0x03e1;
- if (aidlen == 2)
- ndefAID = (aid[0] << 8) + aid[1];
-
- uint8_t ndefkey[6] = {0};
- memcpy(ndefkey, g_mifare_ndef_key, 6);
- if (keylen == 6) {
- memcpy(ndefkey, key, 6);
- }
-
- uint8_t sector0[16 * 4] = {0};
- uint8_t sector10[16 * 4] = {0};
- uint8_t data[4096] = {0};
- int datalen = 0;
-
- PrintAndLogEx(NORMAL, "");
-
- if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
- PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
- return 2;
- }
-
- bool haveMAD2 = false;
- int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
- if (res) {
- PrintAndLogEx(ERR, "MAD error %d.", res);
- return res;
- }
-
- if (haveMAD2) {
- if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
- PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
- return 2;
- }
- }
-
- uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
- size_t madlen = 0;
- if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {
- PrintAndLogEx(ERR, "can't decode mad.");
- return 10;
- }
-
- printf("data reading:");
- for (int i = 0; i < madlen; i++) {
- if (ndefAID == mad[i]) {
- uint8_t vsector[16 * 4] = {0};
- if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector)) {
- PrintAndLogEx(ERR, "read sector %d error.", i + 1);
- return 2;
- }
-
- memcpy(&data[datalen], vsector, 16 * 3);
- datalen += 16 * 3;
-
- printf(".");
- }
- }
- printf(" OK\n");
-
- if (!datalen) {
- PrintAndLogEx(ERR, "no NDEF data.");
- return 11;
- }
-
- if (verbose2) {
- PrintAndLogEx(NORMAL, "NDEF data:");
- dump_buffer(data, datalen, stdout, 1);
- }
-
- NDEFDecodeAndPrint(data, datalen, verbose);
-
- return 0;
+ CLIParserInit("hf mf ndef",
+ "Prints NFC Data Exchange Format (NDEF)",
+ "Usage:\n\thf mf ndef -> shows NDEF data\n"
+ "\thf mf ndef -a 03e1 -k ffffffffffff -b -> shows NDEF data with custom AID, key and with key B\n");
+
+ void *argtable[] = {
+ arg_param_begin,
+ arg_litn("vV", "verbose", 0, 2, "show technical data"),
+ arg_str0("aA", "aid", "replace default aid for NDEF", NULL),
+ arg_str0("kK", "key", "replace default key for NDEF", NULL),
+ arg_lit0("bB", "keyb", "use key B for access sectors (by default: key A)"),
+ arg_param_end
+ };
+ CLIExecWithReturn(cmd, argtable, true);
+
+ bool verbose = arg_get_lit(1);
+ bool verbose2 = arg_get_lit(1) > 1;
+ uint8_t aid[2] = {0};
+ int aidlen;
+ CLIGetHexWithReturn(2, aid, &aidlen);
+ uint8_t key[6] = {0};
+ int keylen;
+ CLIGetHexWithReturn(3, key, &keylen);
+ bool keyB = arg_get_lit(4);
+
+ CLIParserFree();
+
+ uint16_t ndefAID = 0x03e1;
+ if (aidlen == 2)
+ ndefAID = (aid[0] << 8) + aid[1];
+
+ uint8_t ndefkey[6] = {0};
+ memcpy(ndefkey, g_mifare_ndef_key, 6);
+ if (keylen == 6) {
+ memcpy(ndefkey, key, 6);
+ }
+
+ uint8_t sector0[16 * 4] = {0};
+ uint8_t sector10[16 * 4] = {0};
+ uint8_t data[4096] = {0};
+ int datalen = 0;
+
+ PrintAndLogEx(NORMAL, "");
+
+ if (mfReadSector(MF_MAD1_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector0)) {
+ PrintAndLogEx(ERR, "read sector 0 error. card don't have MAD or don't have MAD on default keys.");
+ return 2;
+ }
+
+ bool haveMAD2 = false;
+ int res = MADCheck(sector0, NULL, verbose, &haveMAD2);
+ if (res) {
+ PrintAndLogEx(ERR, "MAD error %d.", res);
+ return res;
+ }
+
+ if (haveMAD2) {
+ if (mfReadSector(MF_MAD2_SECTOR, MF_KEY_A, (uint8_t *)g_mifare_mad_key, sector10)) {
+ PrintAndLogEx(ERR, "read sector 0x10 error. card don't have MAD or don't have MAD on default keys.");
+ return 2;
+ }
+ }
+
+ uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
+ size_t madlen = 0;
+ if (MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen)) {
+ PrintAndLogEx(ERR, "can't decode mad.");
+ return 10;
+ }
+
+ printf("data reading:");
+ for (int i = 0; i < madlen; i++) {
+ if (ndefAID == mad[i]) {
+ uint8_t vsector[16 * 4] = {0};
+ if (mfReadSector(i + 1, keyB ? MF_KEY_B : MF_KEY_A, ndefkey, vsector)) {
+ PrintAndLogEx(ERR, "read sector %d error.", i + 1);
+ return 2;
+ }
+
+ memcpy(&data[datalen], vsector, 16 * 3);
+ datalen += 16 * 3;
+
+ printf(".");
+ }
+ }
+ printf(" OK\n");
+
+ if (!datalen) {
+ PrintAndLogEx(ERR, "no NDEF data.");
+ return 11;
+ }
+
+ if (verbose2) {
+ PrintAndLogEx(NORMAL, "NDEF data:");
+ dump_buffer(data, datalen, stdout, 1);
+ }
+
+ NDEFDecodeAndPrint(data, datalen, verbose);
+
+ return 0;
}
static command_t CommandTable[] =
@@ -2936,7 +2968,7 @@ static command_t CommandTable[] =
{"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"},
+ {"restore", CmdHF14AMfRestore, 0, "Restore MIFARE classic binary file to BLANK tag"},
{"wrbl", CmdHF14AMfWrBl, 0, "Write MIFARE classic block"},
{"auth4", CmdHF14AMfAuth4, 0, "ISO14443-4 AES authentication"},
{"chk", CmdHF14AMfChk, 0, "Test block keys"},
--
2.39.5