This commit is contained in:
iceman1001 2025-03-11 09:21:01 +01:00
parent 6370901476
commit fd0311b139
4 changed files with 7 additions and 7 deletions

View file

@ -3301,7 +3301,7 @@ void ProtectPageSlixIso15693(const uint8_t *read_password, const uint8_t *write_
if (res == PM3_SUCCESS && write_password)
res = set_pass_15693_SlixRnd(start_time, &eof_time, 0x02, write_password, uid, rnd);
if (res == PM3_SUCCESS)
if (res == PM3_SUCCESS)
res = protect_page_15693_Slix(start_time, &eof_time, divide_ptr, prot_status, uid);
reply_ng(CMD_HF_ISO15693_SLIX_PROTECT_PAGE, res, NULL, 0);

View file

@ -3268,11 +3268,11 @@ static int CmdHF15SlixProtectPage(const char *Cmd) {
CLIParserFree(ctx);
return PM3_ESOFT;
}
payload.prot_status |= (uint8_t)pwdlen<<4;
payload.prot_status |= (uint8_t)pwdlen << 4;
PrintAndLogEx(INFO, "Trying to set page protection pointer to " _YELLOW_("%d"), payload.divide_ptr);
PrintAndLogEx(INFO, _YELLOW_("LO") " page access %s%s", (payload.prot_status & 0x01)?_RED_("R"):_GREEN_("r"), (payload.prot_status & 0x02)?_RED_("W"):_GREEN_("w"));
PrintAndLogEx(INFO, _YELLOW_("HI") " page access %s%s", (payload.prot_status & 0x10)?_RED_("R"):_GREEN_("r"), (payload.prot_status & 0x20)?_RED_("W"):_GREEN_("w"));
PrintAndLogEx(INFO, _YELLOW_("LO") " page access %s%s", (payload.prot_status & 0x01) ? _RED_("R") : _GREEN_("r"), (payload.prot_status & 0x02) ? _RED_("W") : _GREEN_("w"));
PrintAndLogEx(INFO, _YELLOW_("HI") " page access %s%s", (payload.prot_status & 0x10) ? _RED_("R") : _GREEN_("r"), (payload.prot_status & 0x20) ? _RED_("W") : _GREEN_("w"));
PacketResponseNG resp;
clearCommandBuffer();

View file

@ -202,7 +202,6 @@ const static vocabulary_t vocabulary[] = {
{ 0, "hf 15 slixeasenable" },
{ 0, "hf 15 slixprivacydisable" },
{ 0, "hf 15 slixprivacyenable" },
{ 0, "hf 15 slixprotectpage" },
{ 0, "hf 15 passprotectafi" },
{ 0, "hf 15 passprotecteas" },
{ 0, "hf 15 findafi" },

View file

@ -5023,6 +5023,7 @@
"-h, --help This help",
"--mini MIFARE Classic Mini / S20",
"--1k MIFARE Classic 1k / S50 (def)",
"--1k+ MIFARE Classic Ev1 1k / S50",
"--2k MIFARE Classic/Plus 2k",
"--4k MIFARE Classic 4k / S70",
"-p, --pwd <hex> password 4bytes",
@ -5032,7 +5033,7 @@
"--start <dec> index of block to start writing (default 0)",
"--end <dec> index of block to end writing (default last block)"
],
"usage": "hf mf gload [-hv] [--mini] [--1k] [--2k] [--4k] [-p <hex>] [-f <fn>] [--emu] [--start <dec>] [--end <dec>]"
"usage": "hf mf gload [-hv] [--mini] [--1k] [--1k+] [--2k] [--4k] [-p <hex>] [-f <fn>] [--emu] [--start <dec>] [--end <dec>]"
},
"hf mf gsave": {
"command": "hf mf gsave",
@ -13214,6 +13215,6 @@
"metadata": {
"commands_extracted": 759,
"extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2025-03-02T15:43:45"
"extracted_on": "2025-03-11T08:20:44"
}
}