github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

EN4x05 dump: show reason of read fails

Browse source
This commit is contained in:
Philippe Teuwen 2020-10-07 23:48:49 +02:00
commit a0a7a3960e
1 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

30
client/src/cmdlfem4x.c
View file

@ -960,8 +960,6 @@ static int CmdEM4x05Dump(const char *Cmd) {
uint32_t pwd = 0; uint32_t pwd = 0;
bool usePwd = false; bool usePwd = false;
bool needReadPwd = true; bool needReadPwd = true;
bool gotWord14 = false;
bool gotWord15 = false;
uint8_t cmdp = 0; uint8_t cmdp = 0;
uint8_t bytes[4] = {0}; uint8_t bytes[4] = {0};
uint32_t data[16]; uint32_t data[16];
@ -991,7 +989,7 @@ static int CmdEM4x05Dump(const char *Cmd) {
} }
int success = PM3_SUCCESS; int success = PM3_SUCCESS;
int status; int status, status14, status15;
uint32_t lock_bits = 0x00; // no blocks locked uint32_t lock_bits = 0x00; // no blocks locked
bool gotLockBits = false; bool gotLockBits = false;
bool lockInPW2 = false; bool lockInPW2 = false;
@ -1011,8 +1009,8 @@ static int CmdEM4x05Dump(const char *Cmd) {
// To flag any blocks locked we need to read blocks 14 and 15 first // To flag any blocks locked we need to read blocks 14 and 15 first
// dont swap endin until we get block lock flags. // dont swap endin until we get block lock flags.
status = EM4x05ReadWord_ext(14, pwd, usePwd, &word); status14 = EM4x05ReadWord_ext(14, pwd, usePwd, &word);
if (status == PM3_SUCCESS) { if (status14 == PM3_SUCCESS) {
if (!usePwd) if (!usePwd)
needReadPwd = false; needReadPwd = false;
if (word != 0x00) { if (word != 0x00) {
@ -1020,19 +1018,17 @@ static int CmdEM4x05Dump(const char *Cmd) {
gotLockBits = true; gotLockBits = true;
} }
data[14] = word; data[14] = word;
gotWord14 = true;
} else { } else {
success = PM3_ESOFT; // If any error ensure fail is set so not to save invalid data success = PM3_ESOFT; // If any error ensure fail is set so not to save invalid data
} }
status = EM4x05ReadWord_ext(15, pwd, usePwd, &word); status15 = EM4x05ReadWord_ext(15, pwd, usePwd, &word);
if (status == PM3_SUCCESS) { if (status15 == PM3_SUCCESS) {
if (word != 0x00) { // assume block 15 is the current lock block if (word != 0x00) { // assume block 15 is the current lock block
lock_bits = word; lock_bits = word;
gotLockBits = true; gotLockBits = true;
lockInPW2 = true; lockInPW2 = true;
} }
data[15] = word; data[15] = word;
gotWord15 = true;
} else { } else {
success = PM3_ESOFT; // If any error ensure fail is set so not to save invalid data success = PM3_ESOFT; // If any error ensure fail is set so not to save invalid data
} }
@ -1048,11 +1044,11 @@ static int CmdEM4x05Dump(const char *Cmd) {
PrintAndLogEx(NORMAL, " %02u | %08X | %s | %s | %s", addr, pwd, sprint_ascii(bytes, 4), gotLockBits ? (lockbit ? _RED_("x") : " ") : _YELLOW_("?"), info[addr]); PrintAndLogEx(NORMAL, " %02u | %08X | %s | %s | %s", addr, pwd, sprint_ascii(bytes, 4), gotLockBits ? (lockbit ? _RED_("x") : " ") : _YELLOW_("?"), info[addr]);
} else { } else {
// The pwd is not needed for Login so we're not sure what's the actual content of that block // The pwd is not needed for Login so we're not sure what's the actual content of that block
PrintAndLogEx(NORMAL, " %02u | | | | %-10s " _RED_("cannot read"), addr, info[addr]); PrintAndLogEx(NORMAL, " %02u | | | | %-10s " _YELLOW_("write only"), addr, info[addr]);
} }
} else { } else {
data[addr] = 0x00; // Unknown password, but not used to set to zeros data[addr] = 0x00; // Unknown password, but not used to set to zeros
PrintAndLogEx(NORMAL, " %02u | | | | %-10s " _RED_("cannot read"), addr, info[addr]); PrintAndLogEx(NORMAL, " %02u | | | | %-10s " _YELLOW_("write only"), addr, info[addr]);
} }
} else { } else {
// success &= EM4x05ReadWord_ext(addr, pwd, usePwd, &word); // success &= EM4x05ReadWord_ext(addr, pwd, usePwd, &word);
@ -1064,24 +1060,24 @@ static int CmdEM4x05Dump(const char *Cmd) {
num_to_bytes(word, 4, bytes); num_to_bytes(word, 4, bytes);
PrintAndLogEx(NORMAL, " %02u | %08X | %s | %s | %s", addr, word, sprint_ascii(bytes, 4), gotLockBits ? (lockbit ? _RED_("x") : " ") : _YELLOW_("?"), info[addr]); PrintAndLogEx(NORMAL, " %02u | %08X | %s | %s | %s", addr, word, sprint_ascii(bytes, 4), gotLockBits ? (lockbit ? _RED_("x") : " ") : _YELLOW_("?"), info[addr]);
} else } else
PrintAndLogEx(NORMAL, " %02u | | | | %-10s " _RED_("cannot read"), addr, info[addr]); PrintAndLogEx(NORMAL, " %02u | | | | %-10s %s", addr, info[addr], status == PM3_EFAILED ? _RED_("read denied") : _RED_("read failed"));
} }
} }
// Print blocks 14 and 15 // Print blocks 14 and 15
// Both lock bits are protected with bit idx 14 (special case) // Both lock bits are protected with bit idx 14 (special case)
if (gotWord14) { if (status14 == PM3_SUCCESS) {
addr = 14; addr = 14;
lockbit = (lock_bits >> addr) & 1; lockbit = (lock_bits >> addr) & 1;
PrintAndLogEx(NORMAL, " %02u | %08X | %s | %s | %-10s %s", addr, data[addr], sprint_ascii(bytes, 4), gotLockBits ? (lockbit ? _RED_("x") : " ") : _YELLOW_("?"), info[addr], lockInPW2 ? "" : _GREEN_("active")); PrintAndLogEx(NORMAL, " %02u | %08X | %s | %s | %-10s %s", addr, data[addr], sprint_ascii(bytes, 4), gotLockBits ? (lockbit ? _RED_("x") : " ") : _YELLOW_("?"), info[addr], lockInPW2 ? "" : _GREEN_("active"));
} else { } else {
PrintAndLogEx(NORMAL, " %02u | | | | %-10s " _RED_("cannot read"), addr, info[addr]); PrintAndLogEx(NORMAL, " %02u | | | | %-10s %s", addr, info[addr], status14 == PM3_EFAILED ? _RED_("read denied") : _RED_("read failed"));
} }
if (gotWord15) { if (status15 == PM3_SUCCESS) {
addr = 15; addr = 15;
lockbit = (lock_bits >> 14) & 1; // beware lock bit of word15 is pr14 lockbit = (lock_bits >> 14) & 1; // beware lock bit of word15 is pr14
PrintAndLogEx(NORMAL, " %02d | %08X | %s | %s | %-10s %s", addr, data[addr], sprint_ascii(bytes, 4), gotLockBits ? (lockbit ? _RED_("x") : " ") : _YELLOW_("?"), info[addr], lockInPW2 ? _GREEN_("active") : ""); PrintAndLogEx(NORMAL, " %02u | %08X | %s | %s | %-10s %s", addr, data[addr], sprint_ascii(bytes, 4), gotLockBits ? (lockbit ? _RED_("x") : " ") : _YELLOW_("?"), info[addr], lockInPW2 ? _GREEN_("active") : "");
} else { } else {
PrintAndLogEx(NORMAL, " %02d | | | | %-10s " _RED_("cannot read"), addr, info[addr]); PrintAndLogEx(NORMAL, " %02u | | | | %-10s %s", addr, info[addr], status15 == PM3_EFAILED ? _RED_("read denied") : _RED_("read failed"));
} }
// Update endian for files // Update endian for files
data[14] = BSWAP_32(data[14]); data[14] = BSWAP_32(data[14]);