RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 10:43:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

CHG: "hf legic read" - increased timeout values client side, reading MIM1024 takes a bit of time

Browse source
This commit is contained in:
iceman1001 2016-10-04 21:26:19 +02:00
parent 86087eba00
commit 7a8db2f678
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
armsrc/legicrf.c
View file

@ -72,7 +72,7 @@ static void setup_timer(void) {
#define RWD_TIME_1 120 // READER_TIME_PAUSE 20us off, 80us on = 100us 80 * 1.5 == 120ticks #define RWD_TIME_1 120 // READER_TIME_PAUSE 20us off, 80us on = 100us 80 * 1.5 == 120ticks
#define RWD_TIME_0 60 // READER_TIME_PAUSE 20us off, 40us on = 60us 40 * 1.5 == 60ticks #define RWD_TIME_0 60 // READER_TIME_PAUSE 20us off, 40us on = 60us 40 * 1.5 == 60ticks
#define RWD_TIME_PAUSE 30 // 20us == 20 * 1.5 == 30ticks */ #define RWD_TIME_PAUSE 30 // 20us == 20 * 1.5 == 30ticks */
#define TAG_BIT_PERIOD 143 // 100us == 100 * 1.5 == 150ticks #define TAG_BIT_PERIOD 142 // 100us == 100 * 1.5 == 150ticks
#define TAG_FRAME_WAIT 495 // 330us from READER frame end to TAG frame start. 330 * 1.5 == 495 #define TAG_FRAME_WAIT 495 // 330us from READER frame end to TAG frame start. 330 * 1.5 == 495
#define RWD_TIME_FUZZ 20 // rather generous 13us, since the peak detector + hysteresis fuzz quite a bit #define RWD_TIME_FUZZ 20 // rather generous 13us, since the peak detector + hysteresis fuzz quite a bit
@ -486,8 +486,6 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
int LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) { int LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
len &= 0x3FF;
uint16_t i = 0; uint16_t i = 0;
uint8_t isOK = 1; uint8_t isOK = 1;
legic_card_select_t card; legic_card_select_t card;
@ -507,7 +505,7 @@ int LegicRfReader(uint16_t offset, uint16_t len, uint8_t iv) {
setup_phase_reader(iv); setup_phase_reader(iv);
LED_B_ON(); LED_B_ON();
while (i < len) { while (i <= len) {
int r = legic_read_byte(offset + i, card.cmdsize); int r = legic_read_byte(offset + i, card.cmdsize);
if (r == -1 || BUTTON_PRESS()) { if (r == -1 || BUTTON_PRESS()) {

16
client/cmdhflegic.c
View file

@ -400,7 +400,7 @@ int CmdLegicRFRead(const char *Cmd) {
// OUT-OF-BOUNDS check // OUT-OF-BOUNDS check
if ( len + offset > MAX_LENGTH ) { if ( len + offset > MAX_LENGTH ) {
len = MAX_LENGTH - offset; len = MAX_LENGTH - offset;
PrintAndLog("Out-of-bound, shorten len to %d", len); PrintAndLog("Out-of-bound, shorten len to %d (0x%02X)", len);
} }
if ( (IV & 0x7F) != IV ){ if ( (IV & 0x7F) != IV ){
@ -412,16 +412,14 @@ int CmdLegicRFRead(const char *Cmd) {
IV |= 0x01; IV |= 0x01;
PrintAndLog("LSB of IV must be SET"); PrintAndLog("LSB of IV must be SET");
} }
//PrintAndLog("Using IV: 0x%02x", IV);
UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, IV}}; UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, IV}};
clearCommandBuffer(); clearCommandBuffer();
SendCommand(&c); SendCommand(&c);
UsbCommand resp; UsbCommand resp;
if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) { if (WaitForResponseTimeout(CMD_ACK, &resp, 2500)) {
uint8_t isOK = resp.arg[0] & 0xFF; uint8_t isOK = resp.arg[0] & 0xFF;
uint16_t readlen = resp.arg[1] & 0x3FF; uint16_t readlen = resp.arg[1];
if ( isOK ) { if ( isOK ) {
uint8_t *data = malloc(readlen); uint8_t *data = malloc(readlen);
@ -435,7 +433,7 @@ int CmdLegicRFRead(const char *Cmd) {
// copy data from device // copy data from device
GetEMLFromBigBuf(data, readlen, 0); GetEMLFromBigBuf(data, readlen, 0);
if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000)){ if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2500)){
PrintAndLog("Command execute timeout"); PrintAndLog("Command execute timeout");
if ( data ) if ( data )
free(data); free(data);
@ -616,7 +614,7 @@ int CmdLegicRfWrite(const char *Cmd) {
// OUT-OF-BOUNDS check // OUT-OF-BOUNDS check
if ( len + offset > MAX_LENGTH ) { if ( len + offset > MAX_LENGTH ) {
len = MAX_LENGTH - offset; len = MAX_LENGTH - offset;
PrintAndLog("Out-of-bound, shorten len to %d", len); PrintAndLog("Out-of-bound, shorten len to %d (0x%02X)", len);
} }
if ( (IV & 0x7F) != IV ){ if ( (IV & 0x7F) != IV ){
IV &= 0x7F; IV &= 0x7F;
@ -659,8 +657,8 @@ int CmdLegicRfRawWrite(const char *Cmd) {
// OUT-OF-BOUNDS check // OUT-OF-BOUNDS check
if ( offset > MAX_LENGTH ) { if ( offset > MAX_LENGTH ) {
offset = MAX_LENGTH; PrintAndLog("Out-of-bound, offset");
PrintAndLog("Out-of-bound, shorten len to %d", offset); return 1;
} }
if ( (IV & 0x7F) != IV ){ if ( (IV & 0x7F) != IV ){