github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 21:33:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

not clear how the slot marker / anticollision loop works for xerox but we seem to ignore retlen

Browse source
This commit is contained in:
iceman1001 2024-01-26 19:48:52 +01:00
commit adfab4992d
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

42
armsrc/iso14443b.c
View file

@ -1394,7 +1394,7 @@ static int Get14443bAnswerFromTag(uint8_t *response, uint16_t max_len, uint32_t
*eof_time = GetCountSspClkDelta(dma_start_time) - DELAY_TAG_TO_ARM; // end of EOF *eof_time = GetCountSspClkDelta(dma_start_time) - DELAY_TAG_TO_ARM; // end of EOF
if (Demod.len > Demod.max_len) { if (Demod.len > Demod.max_len) {
ret = PM3_EOVFLOW; // overflow ret = PM3_EOVFLOW;
} }
break; break;
} }
@ -1410,13 +1410,15 @@ static int Get14443bAnswerFromTag(uint8_t *response, uint16_t max_len, uint32_t
return ret; return ret;
} }
if (Demod.len > 0) { if (Demod.len) {
uint32_t sof_time = *eof_time - HF14_ETU_TO_SSP(
(Demod.len * (8 + 2)) // time for byte transfers // 3 * 10 + 20 + 10 == 60, 60 << 5 = 1920
+ (10 + 2) // time for SOF transfer
+ (10) // time for EOF transfer // We are counting backwards here from EOF
) // tranfers time (in ETU) for
; // bytes SOF EOF
uint32_t deduct = (Demod.len * (8 + 2)) + (10 + 2) + 10;
uint32_t sof_time = *eof_time - HF14_ETU_TO_SSP(deduct);
LogTrace(Demod.output, Demod.len, sof_time, *eof_time, NULL, false); LogTrace(Demod.output, Demod.len, sof_time, *eof_time, NULL, false);
} }
@ -1878,34 +1880,34 @@ static int iso14443b_select_xrx_card(iso14b_card_select_t *card) {
uint32_t start_time = 0; uint32_t start_time = 0;
uint32_t eof_time = 0; uint32_t eof_time = 0;
iso14b_set_timeout(24); // wait for carrier // wait for carrier
iso14b_set_timeout(24);
// wup1 // wup1
CodeAndTransmit14443bAsReader(x_wup1, sizeof(x_wup1), &start_time, &eof_time, false); CodeAndTransmit14443bAsReader(x_wup1, sizeof(x_wup1), &start_time, &eof_time, true);
start_time = eof_time + US_TO_SSP(9000); // 9ms before next cmd start_time = eof_time + US_TO_SSP(9000); // 9ms before next cmd ( 30510 )
// wup2 // wup2
CodeAndTransmit14443bAsReader(x_wup2, sizeof(x_wup2), &start_time, &eof_time, false); CodeAndTransmit14443bAsReader(x_wup2, sizeof(x_wup2), &start_time, &eof_time, true);
uint64_t uid = 0; uint64_t uid = 0;
uint16_t retlen = 0; uint16_t retlen = 0;
for (int uid_pos = 0; uid_pos < 64; uid_pos += 2) { for (uint8_t uid_pos = 0; uid_pos < 64; uid_pos += 2) {
int slot;
uint8_t slot;
for (slot = 0; slot < 4; slot++) { for (slot = 0; slot < 4; slot++) {
start_time = eof_time + HF14_ETU_TO_SSP(30); //(24); // next slot after 24 ETU
if (Get14443bAnswerFromTag(x_atqb, sizeof(x_atqb), s_iso14b_timeout, &eof_time, &retlen) != PM3_SUCCESS) { // next slot after 24 ETU (786)
if (retlen > 0) { start_time = eof_time + HF14_ETU_TO_SSP(30);
Dbprintf("unexpected data %d", retlen); Get14443bAnswerFromTag(x_atqb, sizeof(x_atqb), s_iso14b_timeout, &eof_time, &retlen);
} if (retlen > 0) {
Dbprintf("unexpected data %d", retlen);
return PM3_ECARDEXCHANGE; return PM3_ECARDEXCHANGE;
} }
// tx unframed slot-marker // tx unframed slot-marker
if (Demod.posCount) { // no rx, but subcarrier burst detected if (Demod.posCount) { // no rx, but subcarrier burst detected
uid |= (uint64_t)slot << uid_pos; uid |= (uint64_t)slot << uid_pos;