dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:RfidResearchGroup/proxmark3

Browse Source 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  more crc overshadow
This commit is contained in:
Philippe Teuwen
2019-04-07 12:11:07 +02:00
parent a7448f802f a8ad793f7f
commit b787ccf150
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/cmdanalyse.c
View File

@@ -300,7 +300,7 @@ int CmdAnalyseCRC(const char *Cmd) {
// ISO14443 crc B // ISO14443 crc B
compute_crc(CRC_14443_B, data, len, &b1, &b2); compute_crc(CRC_14443_B, data, len, &b1, &b2);
uint16_t crcBB_1 = b1 << 8 | b2; uint16_t crcBB_1 = b1 << 8 | b2;
uint16_t bbb = crc(CRC_14443_B, data, len); uint16_t bbb = Crc(CRC_14443_B, data, len);
PrintAndLogEx(NORMAL, "ISO14443 crc B | %04x == %04x \n", crcBB_1, bbb); PrintAndLogEx(NORMAL, "ISO14443 crc B | %04x == %04x \n", crcBB_1, bbb);

2
client/cmdhf15.c
View File

@@ -479,7 +479,7 @@ int CmdHF15Demod(const char *Cmd) {
for (i = 0; i < k; i++) for (i = 0; i < k; i++)
PrintAndLogEx(NORMAL, "# %2d: %02x ", i, outBuf[i]); PrintAndLogEx(NORMAL, "# %2d: %02x ", i, outBuf[i]);
PrintAndLogEx(NORMAL, "CRC %04x", Crc(outBuf, k - 2)); PrintAndLogEx(NORMAL, "CRC %04x", Crc15(outBuf, k - 2));
return 0; return 0;
} }