em 4x05_dump: indication of active PW closer to reality

This commit is contained in:
Philippe Teuwen 2020-10-10 17:20:43 +02:00
commit 235d920b52

View file

@ -1013,7 +1013,7 @@ static int CmdEM4x05Dump(const char *Cmd) {
if (status14 == PM3_SUCCESS) { if (status14 == PM3_SUCCESS) {
if (!usePwd) if (!usePwd)
needReadPwd = false; needReadPwd = false;
if (word != 0x00) { if ((word & 0x00008000) != 0x00) {
lock_bits = word; lock_bits = word;
gotLockBits = true; gotLockBits = true;
} }
@ -1023,7 +1023,7 @@ static int CmdEM4x05Dump(const char *Cmd) {
} }
status15 = EM4x05ReadWord_ext(15, pwd, usePwd, &word); status15 = EM4x05ReadWord_ext(15, pwd, usePwd, &word);
if (status15 == PM3_SUCCESS) { if (status15 == PM3_SUCCESS) {
if (word != 0x00) { // assume block 15 is the current lock block if ((word & 0x00008000) != 0x00) { // assume block 15 is the current lock block
lock_bits = word; lock_bits = word;
gotLockBits = true; gotLockBits = true;
lockInPW2 = true; lockInPW2 = true;