lf search - now tries to read out hitag2 data with the paxton key.

This commit is contained in:
iceman1001 committed 2024-09-15 18:19:28 +02:00
1 parent c9531ae62b
commit 805dc99b97
6 files changed
+95 -45

No files matched your search

+13 -2
View File
@@ -1719,9 +1719,22 @@ int CmdLFfind(const char *Cmd) {
PrintAndLogEx(INFO, _CYAN_("Checking for known tags..."));
PrintAndLogEx(INFO, "");
int retval = PM3_SUCCESS;
// only run these tests if device is online
if (is_online) {
if (IfPm3Hitag()) {
if (ht2_read_paxton() == PM3_SUCCESS) {
PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Paxton ID") " found!");
if (search_cont) {
found++;
} else {
goto out;
}
}
}
#if !defined ICOPYX
if (IfPm3EM4x50()) {
if (read_em4x50_uid() == PM3_SUCCESS) {
@@ -1769,8 +1782,6 @@ int CmdLFfind(const char *Cmd) {
}
}
int retval = PM3_SUCCESS;
// ask / man
if (demodEM410x(true) == PM3_SUCCESS) {
PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("EM410x ID") " found!");
+45 -8
View File
@@ -35,6 +35,10 @@
static int CmdHelp(const char *Cmd);
static const uint8_t ht2_default_keys[] = {
0xBD, 0xF5, 0xE8, 0x46 // PAXTON
};
static const char *getHitagTypeStr(uint32_t uid) {
//uid s/n ********
uint8_t type = (uid >> 4) & 0xF;
@@ -205,7 +209,7 @@ static int CmdLFHitagList(const char *Cmd) {
*/
}
static void print_hitag2_paxton(const uint8_t *data) {
static void print_hitag2_paxton(bool show_header, const uint8_t *data) {
// if the pwd isn't..
if (memcmp(data + 4, "\xBD\xF5\xE8\x46", 4)) {
@@ -263,10 +267,14 @@ static void print_hitag2_paxton(const uint8_t *data) {
}
}
PrintAndLogEx(INFO, "");
PrintAndLogEx(INFO, "--- " _CYAN_("Possible de-scramble patterns") " -------------");
if (show_header) {
PrintAndLogEx(INFO, "");
PrintAndLogEx(INFO, "--- " _CYAN_("Possible de-scramble patterns") " -------------");
}
PrintAndLogEx(SUCCESS, "Paxton id... %" PRIu64 " | 0x%" PRIx64 " ( %s )", paxton_id, paxton_id, formfactor);
PrintAndLogEx(INFO, "");
if (show_header) {
PrintAndLogEx(INFO, "");
}
}
static void print_hitag2_configuration(uint32_t uid, uint8_t config) {
@@ -1079,7 +1087,7 @@ static int CmdLFHitagRd(const char *Cmd) {
if (use_ht2) {
print_hitag2_blocks(data, HITAG2_MAX_BYTE_SIZE);
print_hitag2_paxton(data);
print_hitag2_paxton(true, data);
} else {
print_hex_break(data, HITAG_MAX_BYTE_SIZE, HITAG_BLOCK_SIZE);
}
@@ -1624,7 +1632,7 @@ out:
if (use_ht2) {
print_hitag2_configuration(uid, data[HITAG_BLOCK_SIZE * 3]);
print_hitag2_blocks(data, HITAG2_MAX_BYTE_SIZE);
print_hitag2_paxton(data);
print_hitag2_paxton(true, data);
} else {
PrintAndLogEx(INFO, "No memory printing available");
}
@@ -1685,7 +1693,7 @@ static int CmdLFHitagView(const char *Cmd) {
uint8_t config = dump[HITAG2_CONFIG_OFFSET];
uint32_t uid = bytes_to_num(dump, HITAG_UID_SIZE);
print_hitag2_configuration(uid, config);
print_hitag2_paxton(dump);
print_hitag2_paxton(true, dump);
}
print_hitag2_blocks(dump, HITAG2_MAX_BYTE_SIZE);
free(dump);
@@ -1800,7 +1808,7 @@ static int CmdLFHitagEview(const char *Cmd) {
uint8_t config = dump[HITAG2_CONFIG_OFFSET];
uint32_t uid = bytes_to_num(dump, HITAG_UID_SIZE);
print_hitag2_configuration(uid, config);
print_hitag2_paxton(dump);
print_hitag2_paxton(true, dump);
}
print_hitag2_blocks(dump, HITAG2_MAX_BYTE_SIZE);
free(dump);
@@ -2486,6 +2494,35 @@ int ht2_read_uid(void) {
return PM3_SUCCESS;
}
int ht2_read_paxton(void) {
// read block 4,5,6,7
lf_hitag_data_t packet;
memset(&packet, 0, sizeof(packet));
packet.cmd = RHT2F_PASSWORD;
memcpy(packet.pwd, ht2_default_keys, sizeof(packet.pwd));
clearCommandBuffer();
SendCommandNG(CMD_LF_HITAG_READER, (uint8_t *)&packet, sizeof(packet));
PacketResponseNG resp;
if (WaitForResponseTimeout(CMD_LF_HITAG_READER, &resp, 2000) == false) {
SendCommandNG(CMD_BREAK_LOOP, NULL, 0);
return PM3_ETIMEOUT;
}
if (resp.status != PM3_SUCCESS) {
PrintAndLogEx(DEBUG, "DEBUG: Error - hitag failed");
return PM3_ESOFT;
}
uint8_t *data = resp.data.asBytes;
print_hitag2_paxton(false, data);
return PM3_SUCCESS;
}
static command_t CommandTable[] = {
{"help", CmdHelp, AlwaysAvailable, "This help"},
{"list", CmdLFHitagList, AlwaysAvailable, "List Hitag trace history"},
+1
View File
@@ -28,6 +28,7 @@
int CmdLFHitag(const char *Cmd);
int ht2_read_uid(void);
int ht2_read_paxton(void);
void annotateHitag1(char *exp, size_t size, const uint8_t *cmd, uint8_t cmdsize, bool is_response);
void annotateHitag2(char *exp, size_t size, const uint8_t *cmd, uint8_t cmdsize, uint8_t bits, bool is_response, const uint64_t *keys, uint32_t keycount, bool isdecrypted);
void annotateHitagS(char *exp, size_t size, const uint8_t *cmd, uint8_t cmdsize, bool is_response);