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

hitag: wip

Browse source
This commit is contained in:
Philippe Teuwen 2020-01-15 02:02:42 +01:00
commit 6c0d6f0655
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
armsrc/hitag2.c
View file

@ -1337,7 +1337,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
} }
uint8_t tag_modulation; uint8_t tag_modulation;
size_t max_nrzs = 8 * HITAG_FRAME_LEN + 5; size_t max_nrzs = (8 * HITAG_FRAME_LEN + 5) * 2; // up to 2 nrzs per bit
uint8_t nrz_samples[max_nrzs]; uint8_t nrz_samples[max_nrzs];
size_t nrzs = 0; size_t nrzs = 0;
@ -1462,7 +1462,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
break; break;
} }
} }
// Store the TX frame, we do this now at this point, to avoid delay in processing // Store the TX frame, we do this now at this point, to avoid delay in processing
// and to be able to overwrite the first samples with the trace (since they currently // and to be able to overwrite the first samples with the trace (since they currently
// still use the same memory space) // still use the same memory space)
@ -1509,23 +1509,25 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
} }
// Pack the response into a byte array // Pack the response into a byte array
for (size_t i = 5; i < 37; i++){ for (size_t i = 5; i < nrzs; i++){
uint8_t bit = nrz_samples[i]; uint8_t bit = nrz_samples[i];
rx[rxlen / 8] |= bit << (7 - (rxlen % 8)); rx[rxlen / 8] |= bit << (7 - (rxlen % 8));
rxlen++; rxlen++;
} }
if (rxlen % 8 == 1) // skip spurious bit
rxlen--;
// Check if frame was captured and store it // Check if frame was captured and store it
if (rxlen > 0) { if (rxlen > 0) {
frame_count++; frame_count++;
if (bCollision){ // if (bCollision){
// AC decoding hack // // AC decoding hack
fix_ac_decoding(rx, 64); // fix_ac_decoding(rx, 64);
rxlen = 32; // rxlen = 32;
} // }
LogTrace(rx, rxlen, response, 0, NULL, false); LogTrace(rx, nbytes(rxlen), response, 0, NULL, false);
//Dbhexdump(rxlen, rx, false); Dbhexdump(nbytes(rxlen), rx, false);
} }
} }