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

fix: 'hf 14b raw -t' - a bit messed up

Browse source
This commit is contained in:
iceman1001 2019-03-15 02:05:15 +01:00
commit e3127f7440
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/cmdhf14b.c
View file

@ -153,14 +153,13 @@ int CmdHF14BSniff(const char *Cmd) {
} }
int CmdHF14BCmdRaw(const char *Cmd) { int CmdHF14BCmdRaw(const char *Cmd) {
bool reply = true, power = false, select = false, timeout = false; bool reply = true, power = false, select = false, hasTimeout = false;
char buf[5] = ""; char buf[5] = "";
int i = 0; int i = 0;
uint8_t data[USB_CMD_DATA_SIZE] = {0x00}; uint8_t data[USB_CMD_DATA_SIZE] = {0x00};
uint16_t datalen = 0; uint16_t datalen = 0;
uint32_t flags = ISO14B_CONNECT; uint32_t flags = ISO14B_CONNECT;
uint32_t temp = 0; uint32_t temp = 0, user_timeout = 0, time_wait = 0;
uint32_t time_wait = 0;
if (strlen(Cmd) < 3) return usage_hf_14b_raw(); if (strlen(Cmd) < 3) return usage_hf_14b_raw();
@ -192,9 +191,8 @@ int CmdHF14BCmdRaw(const char *Cmd) {
} }
break; break;
case 't': case 't':
timeout = true; hasTimeout = true;
sscanf(Cmd + i + 2, "%d", &temp); sscanf(Cmd + i + 2, "%d", &user_timeout);
timeout = temp;
i += 3; i += 3;
while (Cmd[i] != ' ' && Cmd[i] != '\0') { i++; } while (Cmd[i] != ' ' && Cmd[i] != '\0') { i++; }
i -= 2; i -= 2;
@ -224,14 +222,14 @@ int CmdHF14BCmdRaw(const char *Cmd) {
return 0; return 0;
} }
if (timeout) { if (hasTimeout) {
#define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s #define MAX_TIMEOUT 40542464 // = (2^32-1) * (8*16) / 13560000Hz * 1000ms/s
flags |= ISO14B_SET_TIMEOUT; flags |= ISO14B_SET_TIMEOUT;
if (timeout > MAX_TIMEOUT) { if (user_timeout > MAX_TIMEOUT) {
timeout = MAX_TIMEOUT; user_timeout = MAX_TIMEOUT;
PrintAndLogEx(NORMAL, "Set timeout to 40542 seconds (11.26 hours). The max we can wait for response"); PrintAndLogEx(NORMAL, "Set timeout to 40542 seconds (11.26 hours). The max we can wait for response");
} }
time_wait = 13560000 / 1000 / (8 * 16) * timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us) time_wait = 13560000 / 1000 / (8 * 16) * user_timeout; // timeout in ETUs (time to transfer 1 bit, approx. 9.4 us)
} }
if (power == 0) if (power == 0)