diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c index c07c1bc3c..df4f06230 100644 --- a/armsrc/iso15693.c +++ b/armsrc/iso15693.c @@ -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); diff --git a/client/src/cmdhf15.c b/client/src/cmdhf15.c index 5d5c9fccb..fa5fb266a 100644 --- a/client/src/cmdhf15.c +++ b/client/src/cmdhf15.c @@ -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(); diff --git a/client/src/pm3line_vocabulary.h b/client/src/pm3line_vocabulary.h index 2447b924f..048a92ec8 100644 --- a/client/src/pm3line_vocabulary.h +++ b/client/src/pm3line_vocabulary.h @@ -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" }, diff --git a/doc/commands.json b/doc/commands.json index 812792b26..4c349414b 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -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 password 4bytes", @@ -5032,7 +5033,7 @@ "--start index of block to start writing (default 0)", "--end index of block to end writing (default last block)" ], - "usage": "hf mf gload [-hv] [--mini] [--1k] [--2k] [--4k] [-p ] [-f ] [--emu] [--start ] [--end ]" + "usage": "hf mf gload [-hv] [--mini] [--1k] [--1k+] [--2k] [--4k] [-p ] [-f ] [--emu] [--start ] [--end ]" }, "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" } }