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: bypass some limits for 82xx

Browse source
This commit is contained in:
douniwan5788 2024-09-18 15:05:27 +08:00
commit a9cf1cc67b
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
armsrc/hitagS.c
View file

@ -42,8 +42,8 @@ static struct hitagS_tag tag = {
.data.pages = { .data.pages = {
// Plain mode: | Authentication mode: // Plain mode: | Authentication mode:
[0] = {0x5F, 0xC2, 0x11, 0x84}, // UID | UID [0] = {0x5F, 0xC2, 0x11, 0x84}, // UID | UID
// HITAG S 256 // HITAG S 2048
[1] = {0xC9, 0x00, 0x00, 0xAA}, // CON0 CON1 CON2 Reserved | CON0 CON1 CON2 PWDH0 [1] = {0xCA, 0x00, 0x00, 0xAA}, // CON0 CON1 CON2 Reserved | CON0 CON1 CON2 PWDH0
[2] = {0x48, 0x54, 0x4F, 0x4E}, // Data | PWDL0 PWDL1 KEYH0 KEYH1 [2] = {0x48, 0x54, 0x4F, 0x4E}, // Data | PWDL0 PWDL1 KEYH0 KEYH1
[3] = {0x4D, 0x49, 0x4B, 0x52}, // Data | KEYL0 KEYL1 KEYL2 KEYL3 [3] = {0x4D, 0x49, 0x4B, 0x52}, // Data | KEYL0 KEYL1 KEYL2 KEYL3
[4] = {0xFF, 0x80, 0x00, 0x00}, // Data [4] = {0xFF, 0x80, 0x00, 0x00}, // Data
@ -1338,9 +1338,7 @@ void hts_write_page(const lf_hitag_data_t *payload, bool ledcontrol) {
//check for valid input //check for valid input
if (payload->page == 0) { if (payload->page == 0) {
DBG Dbprintf("Error, invalid page"); DBG Dbprintf("Warning, write page 0");
reply_ng(CMD_LF_HITAGS_WRITE, PM3_EINVARG, NULL, 0);
return;
} }
uint8_t rx[HITAG_FRAME_LEN]; uint8_t rx[HITAG_FRAME_LEN];
@ -1358,9 +1356,8 @@ void hts_write_page(const lf_hitag_data_t *payload, bool ledcontrol) {
//check if the given page exists //check if the given page exists
if (payload->page > tag.max_page) { if (payload->page > tag.max_page) {
DBG Dbprintf("Error, page number too large"); DBG Dbprintf("Warning, page number too large");
res = PM3_EINVARG; // 82xx CON0 is fully modifiable
goto write_end;
} }
//send write page request //send write page request

2
client/src/cmdlfhitaghts.c
View file

@ -234,7 +234,7 @@ static int CmdLFHitagSRead(const char *Cmd) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "--- " _CYAN_("Tag Data") " ----------------------------------"); PrintAndLogEx(INFO, "--- " _CYAN_("Tag Data") " ----------------------------------");
const int hts_mem_sizes[] = {4, 32, 256, 0}; const int hts_mem_sizes[] = {4, 32, 256, 256};
uint32_t size = hts_mem_sizes[config.memory_type]; uint32_t size = hts_mem_sizes[config.memory_type];
print_hex_break(data, size, HITAGS_PAGE_SIZE); print_hex_break(data, size, HITAGS_PAGE_SIZE);