mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-21 05:43:48 -07:00
fix: 'lf keri demod' - proper demod now
This commit is contained in:
parent
dc0dc7b00a
commit
d1c22d0800
1 changed files with 6 additions and 10 deletions
|
@ -92,10 +92,8 @@ int CmdKeriDemod(const char *Cmd) {
|
||||||
uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
|
uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
|
||||||
|
|
||||||
//get internal id
|
//get internal id
|
||||||
uint32_t ID = 0;
|
uint32_t ID = bytebits_to_byte(DemodBuffer+29, 32);
|
||||||
for (uint8_t i = 30; i < 59; i++){
|
ID &= 0x7FFFFFFF;
|
||||||
ID = (ID << 1) | DemodBuffer[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
000000000000000000000000000001XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX111
|
000000000000000000000000000001XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX111
|
||||||
|
@ -112,17 +110,15 @@ int CmdKeriDemod(const char *Cmd) {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
PrintAndLogEx(NORMAL, "KERI Tag Found -- Raw: %08X%08X", raw1 ,raw2);
|
PrintAndLogEx(NORMAL, "KERI Tag Found -- Raw: %08X%08X", raw1 ,raw2);
|
||||||
|
PrintAndLogEx(NORMAL, "KERI Internal ID: %u", ID);
|
||||||
PrintAndLogEx(NORMAL, "KERI Internal ID: %d", ID);
|
|
||||||
|
|
||||||
if (invert){
|
if (invert){
|
||||||
PrintAndLogEx(NORMAL, "Had to Invert - probably KERI");
|
PrintAndLogEx(NORMAL, "Had to Invert - probably KERI");
|
||||||
for (size_t i = 0; i < size; i++)
|
for (size_t i = 0; i < size; i++)
|
||||||
DemodBuffer[i] ^= 1;
|
DemodBuffer[i] ^= 1;
|
||||||
|
|
||||||
|
CmdPrintDemodBuff("x");
|
||||||
}
|
}
|
||||||
|
|
||||||
CmdPrintDemodBuff("x");
|
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue