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

Merge pull request #1051 from mwalker33/t55-detect-with-wake

Browse source 
T55 detect with wake
This commit is contained in:
Iceman 2020-11-08 11:28:04 +01:00 • committed by GitHub
commit 8ca004294f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 65 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

88
client/src/cmdlft55xx.c
View file

@ -1024,6 +1024,9 @@ static void T55xx_Print_DownlinkMode(uint8_t downlink_mode) {
PrintAndLogEx(NORMAL, msg); PrintAndLogEx(NORMAL, msg);
} }
// Define prototype to call from within detect.
static int CmdT55xxWakeUp (const char *Cmd);
static int CmdT55xxDetect(const char *Cmd) { static int CmdT55xxDetect(const char *Cmd) {
bool errors = false; bool errors = false;
@ -1032,9 +1035,16 @@ static int CmdT55xxDetect(const char *Cmd) {
bool try_with_pwd = false; bool try_with_pwd = false;
bool try_all_dl_modes = true; bool try_all_dl_modes = true;
bool found = false; bool found = false;
bool usewake = false;
uint64_t password = -1; uint64_t password = -1;
uint8_t cmdp = 0; uint8_t cmdp = 0;
uint8_t downlink_mode = 0; uint8_t downlink_mode = 0;
char wakecmd[20] = { 0x00 };
struct timespec sleepperiod;
// Setup the 90ms time value to sleep for after the wake, to allow delay init to complete (~70ms)
sleepperiod.tv_sec = 0;
sleepperiod.tv_nsec = 90000000;
while (param_getchar(Cmd, cmdp) != 0x00 && !errors) { while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
switch (tolower(param_getchar(Cmd, cmdp))) { switch (tolower(param_getchar(Cmd, cmdp))) {
@ -1042,6 +1052,7 @@ static int CmdT55xxDetect(const char *Cmd) {
return usage_t55xx_detect(); return usage_t55xx_detect();
case 'p': case 'p':
password = param_get32ex(Cmd, cmdp + 1, 0, 16); password = param_get32ex(Cmd, cmdp + 1, 0, 16);
sprintf (wakecmd,"p %08x q",(uint32_t)(password & 0xFFFFFFFF));
usepwd = true; usepwd = true;
cmdp += 2; cmdp += 2;
break; break;
@ -1064,6 +1075,7 @@ static int CmdT55xxDetect(const char *Cmd) {
} }
if (errors) return usage_t55xx_detect(); if (errors) return usage_t55xx_detect();
// detect called so clear data blocks // detect called so clear data blocks
T55x7_ClearAllBlockData(); T55x7_ClearAllBlockData();
@ -1072,38 +1084,61 @@ static int CmdT55xxDetect(const char *Cmd) {
return PM3_ESOFT; return PM3_ESOFT;
if (useGB == false) { if (useGB == false) {
// do ... while to check without password then loop back if password supplied // do ... while not found and not yet tried with wake (for AOR or Init Delay)
do { do {
// do ... while to check without password then loop back if password supplied
do {
if (try_all_dl_modes) { if (try_all_dl_modes) {
for (uint8_t m = downlink_mode; m < 4; m++) { for (uint8_t m = downlink_mode; m < 4; m++) {
if (usewake) {
// call wake
if (try_with_pwd)
CmdT55xxWakeUp (wakecmd);
else
CmdT55xxWakeUp ("q");
// sleep 90 ms
nanosleep (&sleepperiod, &sleepperiod);
}
if (AcquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, (try_with_pwd && usepwd), password, m) == false) if (AcquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, (try_with_pwd && usepwd), password, m) == false)
continue; continue;
if (t55xxTryDetectModulationEx(m, T55XX_PrintConfig, 0, (try_with_pwd && usepwd) ? password : -1) == false) if (t55xxTryDetectModulationEx(m, T55XX_PrintConfig, 0, (try_with_pwd && usepwd) ? password : -1) == false)
continue; continue;
found = true; found = true;
break; break;
}
} else {
if (usewake) {
// call wake
if (try_with_pwd)
CmdT55xxWakeUp (wakecmd);
else
CmdT55xxWakeUp ("q");
// sleep 90 ms
nanosleep (&sleepperiod, &sleepperiod);
}
if (AcquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password, downlink_mode)) {
found = t55xxTryDetectModulationEx(downlink_mode, T55XX_PrintConfig, 0, (usepwd) ? password : -1);
}
} }
} else {
if (AcquireData(T55x7_PAGE0, T55x7_CONFIGURATION_BLOCK, usepwd, password, downlink_mode)) {
found = t55xxTryDetectModulationEx(downlink_mode, T55XX_PrintConfig, 0, (usepwd) ? password : -1);
}
}
// toggle so we loop back if not found and try with pwd // toggle so we loop back if not found and try with pwd
if (!found && usepwd) if (!found && usepwd)
try_with_pwd = !try_with_pwd; try_with_pwd = !try_with_pwd;
// force exit as detect block has been found // force exit as detect block has been found
if (found) if (found)
try_with_pwd = false; try_with_pwd = false;
} while (try_with_pwd);
} while (try_with_pwd);
// Toggle so we loop back and try with wakeup.
usewake = !usewake;
} while (!found && usewake);
} else { } else {
found = t55xxTryDetectModulation(downlink_mode, T55XX_PrintConfig); found = t55xxTryDetectModulation(downlink_mode, T55XX_PrintConfig);
} }
@ -1619,6 +1654,7 @@ static int CmdT55xxWakeUp(const char *Cmd) {
uint8_t cmdp = 0; uint8_t cmdp = 0;
bool errors = false; bool errors = false;
uint8_t downlink_mode = config.downlink_mode; uint8_t downlink_mode = config.downlink_mode;
bool quiet = false;
while (param_getchar(Cmd, cmdp) != 0x00 && !errors) { while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
switch (tolower(param_getchar(Cmd, cmdp))) { switch (tolower(param_getchar(Cmd, cmdp))) {
@ -1635,6 +1671,10 @@ static int CmdT55xxWakeUp(const char *Cmd) {
cmdp += 2; cmdp += 2;
break; break;
case 'q':
quiet = true;
cmdp++;
break;
default: default:
PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp)); PrintAndLogEx(WARNING, "Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = true; errors = true;
@ -1659,7 +1699,9 @@ static int CmdT55xxWakeUp(const char *Cmd) {
return PM3_ETIMEOUT; return PM3_ETIMEOUT;
} }
PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now"); if (!quiet)
PrintAndLogEx(SUCCESS, "Wake up command sent. Try read now");
return PM3_SUCCESS; return PM3_SUCCESS;
} }