mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-03-20 03:48:33 +08:00
FIXES: the custom keys testloop now increases the read pwd :)
This commit is contained in:
parent
21865cda09
commit
060fdaf998
2 changed files with 14 additions and 4 deletions
|
@ -1388,12 +1388,16 @@ int CmdT55xxBruteForce(const char *Cmd) {
|
||||||
PrintAndLog("No keys found in file");
|
PrintAndLog("No keys found in file");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
PrintAndLog("Loaded %d keys", keycnt);
|
||||||
|
|
||||||
// loop
|
// loop
|
||||||
uint32_t testpwd = 0x00;
|
uint64_t testpwd = 0x00;
|
||||||
for (uint16_t c = 0; c < keycnt; ++c ) {
|
for (uint16_t c = 0; c < keycnt; ++c ) {
|
||||||
|
|
||||||
testpwd = bytes_to_num(keyBlock + 4*keycnt, 4);
|
testpwd = bytes_to_num(keyBlock + 4*c, 4);
|
||||||
|
|
||||||
|
PrintAndLog("Testing %08X", testpwd);
|
||||||
|
|
||||||
|
|
||||||
AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd);
|
AquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, TRUE, testpwd);
|
||||||
found = tryDetectModulation();
|
found = tryDetectModulation();
|
||||||
|
@ -1403,9 +1407,13 @@ int CmdT55xxBruteForce(const char *Cmd) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
PrintAndLog("Password NOT found.");
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Try to read Block 7, first :)
|
||||||
|
|
||||||
|
// incremental pwd range search
|
||||||
start_password = param_get32ex(Cmd, 0, 0, 16);
|
start_password = param_get32ex(Cmd, 0, 0, 16);
|
||||||
end_password = param_get32ex(Cmd, 1, 0, 16);
|
end_password = param_get32ex(Cmd, 1, 0, 16);
|
||||||
|
|
||||||
|
|
|
@ -71,3 +71,5 @@ F0000000,
|
||||||
AABBCCDD,
|
AABBCCDD,
|
||||||
BBCCDDEE,
|
BBCCDDEE,
|
||||||
CCDDEEFF,
|
CCDDEEFF,
|
||||||
|
0CB7E7FC, //rfidler?
|
||||||
|
FABADA11, //china?
|
Loading…
Add table
Reference in a new issue