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 narrow type ..

Browse source
This commit is contained in:
iceman1001 2024-09-14 14:19:20 +02:00
commit 8f9ca98f6c
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/src/cmdlf.c
View file

@ -323,14 +323,17 @@ int CmdLFCommandRead(const char *Cmd) {
} }
if (add_crc_ht) { if (add_crc_ht) {
// Hitag 1, Hitag S, ZX8211 // Hitag 1, Hitag S, ZX8211
// width=8 poly=0x1d init=0xff refin=false refout=false xorout=0x00 check=0xb4 residue=0x00 name="CRC-8/HITAG" // width=8 poly=0x1d init=0xff refin=false refout=false xorout=0x00 check=0xb4 residue=0x00 name="CRC-8/HITAG"
crc_t crc; crc_t crc;
crc_init_ref(&crc, 8, 0x1d, 0xff, 0, false, false);
uint8_t data = 0; uint8_t data = 0;
uint8_t n = 0; uint8_t n = 0;
crc_init_ref(&crc, 8, 0x1d, 0xff, 0, false, false);
uint8_t i; for (int i = 0; i < cmd_len; i++) {
for (i = 0; i < cmd_len; i++) {
if ((cmd[i] != '0') && (cmd[i] != '1')) { if ((cmd[i] != '0') && (cmd[i] != '1')) {
// avoid include 'W0S' in crc // avoid include 'W0S' in crc
crc_init_ref(&crc, 8, 0x1d, 0xff, 0, false, false); crc_init_ref(&crc, 8, 0x1d, 0xff, 0, false, false);
@ -338,18 +341,22 @@ int CmdLFCommandRead(const char *Cmd) {
data = 0; data = 0;
continue; continue;
} }
data <<= 1; data <<= 1;
data += cmd[i] - '0'; data += cmd[i] - '0';
n += 1; n++;
if (n == 8) { if (n == 8) {
crc_update2(&crc, data, n); crc_update2(&crc, data, n);
n = 0; n = 0;
data = 0; data = 0;
} }
} }
if (n > 0) { if (n > 0) {
crc_update2(&crc, data, n); crc_update2(&crc, data, n);
} }
uint8_t crc_final = crc_finish(&crc); uint8_t crc_final = crc_finish(&crc);
for (int j = 7; j >= 0; j--) { for (int j = 7; j >= 0; j--) {
cmd[cmd_len] = ((crc_final >> j) & 1) ? '1' : '0'; cmd[cmd_len] = ((crc_final >> j) & 1) ? '1' : '0';