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 viegand decoder in hf iclass rdbl

Browse source
This commit is contained in:
iceman1001 2022-07-09 14:14:48 +02:00
commit dcea185ca2
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client/src/cmdhficlass.c
View file

@ -2363,23 +2363,21 @@ static int CmdHFiClass_ReadBlock(const char *Cmd) {
if (memcmp(dec_data, empty, 8) != 0) { if (memcmp(dec_data, empty, 8) != 0) {
//todo: remove preamble/sentinel //todo: remove preamble/sentinel
uint32_t top = 0, mid = 0, bot = 0;
uint32_t top = 0, mid, bot;
mid = bytes_to_num(dec_data, 4);
bot = bytes_to_num(dec_data + 4, 4);
char hexstr[16 + 1] = {0}; char hexstr[16 + 1] = {0};
hex_to_buffer((uint8_t *)hexstr, dec_data, 8, sizeof(hexstr) - 1, 0, 0, true); hex_to_buffer((uint8_t *)hexstr, dec_data, 8, sizeof(hexstr) - 1, 0, 0, true);
char binstr[64 + 1] = {0}; hexstring_to_u96(&top, &mid, &bot, hexstr);
hextobinstring(binstr, hexstr);
size_t i = 0;
while (i < strlen(binstr) && binstr[i++] == '0');
i &= 0x3C; char binstr[64 + 1];
PrintAndLogEx(SUCCESS, " bin : %s", binstr + i); hextobinstring(binstr, hexstr);
char *pbin = binstr;
while (strlen(pbin) && *(++pbin) == '0');
PrintAndLogEx(SUCCESS, " bin : %s", pbin);
PrintAndLogEx(INFO, ""); PrintAndLogEx(INFO, "");
PrintAndLogEx(INFO, "------------------------------ " _CYAN_("wiegand") " -------------------------------"); PrintAndLogEx(INFO, "------------------------------ " _CYAN_("wiegand") " -------------------------------");
wiegand_message_t packed = initialize_message_object(top, mid, bot, strlen(binstr + i)); wiegand_message_t packed = initialize_message_object(top, mid, bot, 0);
HIDTryUnpack(&packed); HIDTryUnpack(&packed);
} else { } else {
PrintAndLogEx(INFO, "no credential found"); PrintAndLogEx(INFO, "no credential found");