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

better detection of empty blocks

Browse Source
This commit is contained in:
iceman1001
2021-04-18 11:35:38 +02:00
parent d1507bd4c0
commit 155443754b
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/src/cmdhficlass.c
View File

@@ -43,6 +43,7 @@ static void iclass_set_last_known_card(picopass_hdr_t *card) {
} }
static uint8_t empty[8] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}; static uint8_t empty[8] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
static uint8_t zeros[8] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
@@ -1273,17 +1274,18 @@ static int CmdHFiClassDecrypt(const char *Cmd) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
// decode block 6 // decode block 6
if (memcmp(decrypted + (8 * 6), empty, 8) != 0) { bool has_values = (memcmp(decrypted + (8 * 6), empty, 8) != 0) && (memcmp(decrypted + (8 * 6), zeros, 8) != 0);
if (has_values) {
if (use_sc) { if (use_sc) {
DecodeBlock6(decrypted + (8 * 6)); DecodeBlock6(decrypted + (8 * 6));
} }
} }
// decode block 7-8-9 // decode block 7-8-9
if (memcmp(decrypted + (8 * 7), empty, 8) != 0) { has_values = (memcmp(decrypted + (8 * 7), empty, 8) != 0) && (memcmp(decrypted + (8 * 7), zeros, 8) != 0);
if (has_values) {
//todo: remove preamble/sentinal //todo: remove preamble/sentinal
uint32_t top = 0, mid, bot; uint32_t top = 0, mid, bot;
mid = bytes_to_num(decrypted + (8 * 7), 4); mid = bytes_to_num(decrypted + (8 * 7), 4);
bot = bytes_to_num(decrypted + (8 * 7) + 4, 4); bot = bytes_to_num(decrypted + (8 * 7) + 4, 4);
@@ -1305,18 +1307,20 @@ static int CmdHFiClassDecrypt(const char *Cmd) {
HIDTryUnpack(&packed, true); HIDTryUnpack(&packed, true);
} else { } else {
PrintAndLogEx(INFO, "No credential found."); PrintAndLogEx(INFO, "No credential found");
} }
// decode block 9 // decode block 9
if (memcmp(decrypted + (8 * 9), empty, 8) != 0) { has_values = (memcmp(decrypted + (8 * 9), empty, 8) != 0) && (memcmp(decrypted + (8 * 9), zeros, 8) != 0);
if (has_values) {
uint8_t usr_blk_len = GetNumberBlocksForUserId(decrypted + (8 * 6)); uint8_t usr_blk_len = GetNumberBlocksForUserId(decrypted + (8 * 6));
if (usr_blk_len < 3) { if (usr_blk_len < 3) {
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "Block 9 decoder");
if (use_sc) { if (use_sc) {
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "Block 9 decoder");
uint8_t pinsize = GetPinSize(decrypted + (8 * 6)); uint8_t pinsize = GetPinSize(decrypted + (8 * 6));
if (pinsize > 0) { if (pinsize > 0) {