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

CHG: better printing output of card ID

Browse source 
CHG: better detecting in preambl. 16bits with 1, and a zero bit.  Also cleared this topbit when cloneing and simulating.
This commit is contained in:
iceman1001 2016-07-29 14:31:39 +02:00
commit 29ce214c65
2 changed files with 65 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

20
common/lfdemod.c
View file

@ -732,21 +732,27 @@ int JablotronDemod(uint8_t *dest, size_t *size){
size_t startIdx = 0;
// 0xFFFF preamble, 64bits
uint8_t preamble[] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
uint8_t preamble[] = {
1,1,1,1,
1,1,1,1,
1,1,1,1,
1,1,1,1,
0
};
uint8_t errChk = preambleSearch(dest, preamble, sizeof(preamble), size, &startIdx);
if (errChk == 0) return -4; //preamble not found
if (*size != 64) return -3;
uint8_t checkCalc = 0;
uint8_t checkchksum = 0;
for (int i=16; i < 56; i += 8) {
checkCalc += bytebits_to_byte(dest+startIdx+i,8);
checkchksum += bytebits_to_byte(dest+startIdx+i,8);
}
checkCalc ^= 0x3A;
checkchksum ^= 0x3A;
uint8_t crc = bytebits_to_byte(dest+startIdx+56,8);
uint8_t crc = bytebits_to_byte(dest+startIdx+56, 8);
if ( checkCalc != crc ) return -5;
if (*size != 64) return -6;
if ( checkchksum != crc ) return -5;
return (int)startIdx;
}