RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 07:46:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 'lf indala' Commit 1dae981 extended the amount of

Browse source 
fixed bits searched for when decoding 64-bit Indala. These additional
bits come from the end of one UID, and therefore need to be skipped past
when actually retrieving the UID.  (@megabug)
b05611a30b
This commit is contained in:
iceman1001 2018-03-28 12:53:27 +02:00
parent b26919b24d
commit 230c279124
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/cmdlfindala.c
View file

@ -58,6 +58,7 @@ int usage_lf_indala_clone(void) {
// indala id decoding // indala id decoding
int indala64decode(uint8_t *dest, size_t *size, uint8_t *invert) { int indala64decode(uint8_t *dest, size_t *size, uint8_t *invert) {
//standard 64 bit indala formats including 26 bit 40134 format //standard 64 bit indala formats including 26 bit 40134 format
// Note: these start with 3 bits from the end of one UID; the rest are from a subsequent one
uint8_t preamble64[] = {1,0,1,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 1}; uint8_t preamble64[] = {1,0,1,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,0, 1};
uint8_t preamble64_i[] = {0,1,0,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 0}; uint8_t preamble64_i[] = {0,1,0,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 1,1,1,1, 0};
size_t idx = 0; size_t idx = 0;
@ -69,6 +70,9 @@ int indala64decode(uint8_t *dest, size_t *size, uint8_t *invert) {
} }
if (found_size != 64) return -2; if (found_size != 64) return -2;
// Skip the aforementioned 3 bits from the previous UID
startidx += 3;
if (*invert == 1) if (*invert == 1)
for (size_t i = idx; i < found_size + idx; i++) for (size_t i = idx; i < found_size + idx; i++)
dest[i] ^= 1; dest[i] ^= 1;