RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 15:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

em tuning

Browse source
This commit is contained in:
Philippe Teuwen 2020-10-15 23:31:03 +02:00
parent f39131f5f0
commit ab2d232689
1 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
client/src/cmdlfem4x.c
View file

@ -1802,7 +1802,7 @@ static int CmdEM4x05Unlock(const char *Cmd) {
// main loop
//
//uint32_t prev_delay = 0;
bool success = false;
uint64_t t1 = msclock();
while (start <= end) {
@ -1868,7 +1868,7 @@ static int CmdEM4x05Unlock(const char *Cmd) {
if (res == PM3_SUCCESS) {
//PrintAndLogEx(INFO, "14 after [ " _GREEN_("%08X") " ]", word14);
} else {
continue;
break;
}
// read after trigger
@ -1876,7 +1876,7 @@ static int CmdEM4x05Unlock(const char *Cmd) {
if (res == PM3_SUCCESS) {
//PrintAndLogEx(INFO, "15 after [ " _GREEN_("%08X") " ]", word15);
} else {
continue;
break;
}
if (verbose)
@ -1910,14 +1910,14 @@ static int CmdEM4x05Unlock(const char *Cmd) {
// read after reset
res = EM4x05ReadWord_ext(14, pwd, use_pwd, &word14b);
if (res != PM3_SUCCESS) {
continue;
break;
}
if (word14b == 0) {
unlock_reset(use_pwd, pwd, write_value);
res = EM4x05ReadWord_ext(14, pwd, use_pwd, &word14b);
if (res != PM3_SUCCESS) {
continue;
break;
}
}
@ -1927,10 +1927,9 @@ static int CmdEM4x05Unlock(const char *Cmd) {
res = EM4x05ReadWord_ext(15, pwd, use_pwd, &word15b);
if (res == PM3_SUCCESS) {
PrintAndLogEx(INFO, "Status: new definitive value! => " _RED_("SUCCESS:") " 14: " _CYAN_("%08X") " 15: %08X", word14b, word15b);
break;
} else {
continue;
success = true;
}
break;
}
if (my_auto) {
end = start;
@ -1969,21 +1968,18 @@ static int CmdEM4x05Unlock(const char *Cmd) {
if (word14b == word15) {
PrintAndLogEx(INFO, "Status: confirmed => " _RED_("SUCCESS: ") "14: " _CYAN_("%08X") " 15: %08X", word14b, word15b);
success = true;
break;
}
if (word14b != search_value) {
PrintAndLogEx(INFO, "Status: new definitive value! => " _RED_("SUCCESS: ") "14: " _CYAN_("%08X") " 15: %08X", word14b, word15b);
success = true;
break;
}
PrintAndLogEx(INFO, "Status: failed to commit bitflip => " _RED_("FAIL: ") "14: %08X 15: %08X", word14b, word15b);
}
} else {
PrintAndLogEx(INFO, "Status: 15 bitflipped but inactive => " _YELLOW_("PROMISING: ") "14: %08X 15: " _CYAN_("%08X"), word14, word15);
}
if (my_auto) {
n = 0;
end = start;
@ -1992,6 +1988,10 @@ static int CmdEM4x05Unlock(const char *Cmd) {
soon = 0;
late = 0;
}
} else {
PrintAndLogEx(INFO, "Status: 15 bitflipped but inactive => " _YELLOW_("PROMISING: ") "14: %08X 15: " _CYAN_("%08X"), word14, word15);
soon ++;
}
}
}
@ -2003,6 +2003,7 @@ static int CmdEM4x05Unlock(const char *Cmd) {
PrintAndLogEx(INFO, "----------------------------- " _CYAN_("exit") " ----------------------------------\n");
t1 = msclock() - t1;
PrintAndLogEx(SUCCESS, "\ntime in unlock " _YELLOW_("%.0f") " seconds\n", (float)t1 / 1000.0);
if (success)
PrintAndLogEx(INFO, "try " _YELLOW_("`lf em 4x05_dump`"));
PrintAndLogEx(NORMAL, "");
return exit_code;