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

fix: 'lf ti demod - crc is now fixed

Browse source
This commit is contained in:
iceman1001 2020-05-28 10:16:22 +02:00
commit c3a706b8cf
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

35
client/src/cmdlfti.c
View file

@ -85,7 +85,6 @@ static int CmdTIDemod(const char *Cmd) {
int lowLen = ARRAYLEN(LowTone); int lowLen = ARRAYLEN(LowTone);
int highLen = ARRAYLEN(HighTone); int highLen = ARRAYLEN(HighTone);
int convLen = (highLen > lowLen) ? highLen : lowLen; int convLen = (highLen > lowLen) ? highLen : lowLen;
uint16_t crc;
int i, j, TagType; int i, j, TagType;
int lowSum = 0, highSum = 0; int lowSum = 0, highSum = 0;
int lowTot = 0, highTot = 0; int lowTot = 0, highTot = 0;
@ -241,25 +240,23 @@ static int CmdTIDemod(const char *Cmd) {
// i'm 99% sure the crc algorithm is correct, but it may need to eat the // i'm 99% sure the crc algorithm is correct, but it may need to eat the
// bytes in reverse or something // bytes in reverse or something
// calculate CRC // calculate CRC
crc = 0; uint8_t raw[8] = {
crc = update_crc16(crc, (shift0 >> 0) & 0xFF); (shift0 >> 0) & 0xFF,
crc = update_crc16(crc, (shift0 >> 8) & 0xFF); (shift0 >> 8) & 0xFF,
crc = update_crc16(crc, (shift0 >> 16) & 0xFF); (shift0 >> 16) & 0xFF,
crc = update_crc16(crc, (shift0 >> 24) & 0xFF); (shift0 >> 24) & 0xFF,
(shift1 >> 0) & 0xFF,
(shift1 >> 8) & 0xFF,
(shift1 >> 16) & 0xFF,
(shift1 >> 24) & 0xFF
};
init_table(CRC_KERMIT);
uint16_t calccrc = crc16_kermit(raw, sizeof(raw));
const char *crc_str = (calccrc == (shift2 & 0xFFFF)) ? _GREEN_("ok") : _RED_("fail");
PrintAndLogEx(INFO, "Tag data = %08X%08X [%04X] (%s)", shift1, shift0, calccrc, crc_str);
crc = update_crc16(crc, (shift1 >> 0) & 0xFF); if (calccrc != (shift2 & 0xFFFF))
crc = update_crc16(crc, (shift1 >> 8) & 0xFF); PrintAndLogEx(WARNING, "Warning: CRC mismatch, calculated %04X, got %04X", calccrc, shift2 & 0xFFFF);
crc = update_crc16(crc, (shift1 >> 16) & 0xFF);
crc = update_crc16(crc, (shift1 >> 24) & 0xFF);
//crc = crc16_ccitt(message, sizeof(message);
const char *crcStr = (crc == (shift2 & 0xFFFF)) ? _GREEN_("Passed") : _RED_("Fail");
PrintAndLogEx(INFO, "Tag data = %08X%08X [Crc %04X %s]", shift1, shift0, crc, crcStr);
if (crc != (shift2 & 0xFFFF))
PrintAndLogEx(WARNING, "Warning: CRC mismatch, calculated %04X, got %04X", crc, shift2 & 0xFFFF);
retval = PM3_SUCCESS; retval = PM3_SUCCESS;
goto out; goto out;