github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 22:03:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow to write tags in unsecured pagemode

Browse source
This commit is contained in:
iceman1001 2020-11-09 09:58:30 +01:00
commit 3cd2c0b47b
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client/src/cmdhficlass.c
View file

@ -1760,7 +1760,7 @@ write_dump:
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int iclass_write_block(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_credit_key, bool elite, bool rawkey, bool replay, bool verbose) { static int iclass_write_block(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bool use_credit_key, bool elite, bool rawkey, bool replay, bool verbose, bool use_secure_pagemode) {
iclass_writeblock_req_t payload = { iclass_writeblock_req_t payload = {
.req.use_raw = rawkey, .req.use_raw = rawkey,
@ -1769,7 +1769,7 @@ static int iclass_write_block(uint8_t blockno, uint8_t *bldata, uint8_t *KEY, bo
.req.use_replay = replay, .req.use_replay = replay,
.req.blockno = blockno, .req.blockno = blockno,
.req.send_reply = true, .req.send_reply = true,
.req.do_auth = true, .req.do_auth = use_secure_pagemode,
}; };
memcpy(payload.req.key, KEY, 8); memcpy(payload.req.key, KEY, 8);
memcpy(payload.data, bldata, sizeof(payload.data)); memcpy(payload.data, bldata, sizeof(payload.data));
@ -1804,6 +1804,7 @@ static int CmdHFiClass_WriteBlock(const char *Cmd) {
bool use_replay = false; bool use_replay = false;
bool errors = false; bool errors = false;
bool verbose = false; bool verbose = false;
bool use_secure_pagemode = false;
uint8_t cmdp = 0; uint8_t cmdp = 0;
while (param_getchar(Cmd, cmdp) != 0x00 && !errors) { while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
switch (tolower(param_getchar(Cmd, cmdp))) { switch (tolower(param_getchar(Cmd, cmdp))) {
@ -1848,6 +1849,7 @@ static int CmdHFiClass_WriteBlock(const char *Cmd) {
PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n"); PrintAndLogEx(WARNING, "\nERROR: Credit Key is incorrect length\n");
errors = true; errors = true;
} }
use_secure_pagemode = true;
cmdp += 2; cmdp += 2;
break; break;
case 'r': case 'r':
@ -1880,9 +1882,9 @@ static int CmdHFiClass_WriteBlock(const char *Cmd) {
errors = true; errors = true;
} }
if (errors || cmdp < 6) return usage_hf_iclass_writeblock(); if (errors || cmdp < 4) return usage_hf_iclass_writeblock();
int isok = iclass_write_block(blockno, bldata, KEY, use_credit_key, elite, rawkey, use_replay, verbose); int isok = iclass_write_block(blockno, bldata, KEY, use_credit_key, elite, rawkey, use_replay, verbose, use_secure_pagemode);
switch (isok) { switch (isok) {
case PM3_SUCCESS: case PM3_SUCCESS:
PrintAndLogEx(SUCCESS, "Wrote block %02X successful", blockno); PrintAndLogEx(SUCCESS, "Wrote block %02X successful", blockno);
@ -3565,10 +3567,11 @@ int info_iclass(void) {
PrintAndLogEx(INFO, "------------------------ " _CYAN_("Fingerprint") " -----------------------"); PrintAndLogEx(INFO, "------------------------ " _CYAN_("Fingerprint") " -----------------------");
uint8_t aia[8]; uint8_t aia[8];
if (pagemap == PICOPASS_NON_SECURE_PAGEMODE) if (pagemap == PICOPASS_NON_SECURE_PAGEMODE) {
memcpy(aia, ns_hdr->app_issuer_area, sizeof(aia)); memcpy(aia, ns_hdr->app_issuer_area, sizeof(aia));
else } else {
memcpy(aia, hdr->app_issuer_area, sizeof(aia)); memcpy(aia, hdr->app_issuer_area, sizeof(aia));
}
// if CSN ends with FF12E0, it's inside HID CSN range. // if CSN ends with FF12E0, it's inside HID CSN range.
bool isHidRange = (memcmp(hdr->csn + 5, "\xFF\x12\xE0", 3) == 0); bool isHidRange = (memcmp(hdr->csn + 5, "\xFF\x12\xE0", 3) == 0);
@ -3583,11 +3586,13 @@ int info_iclass(void) {
if (se_enabled) if (se_enabled)
PrintAndLogEx(SUCCESS, " Credential... " _GREEN_("iCLASS SE")); PrintAndLogEx(SUCCESS, " Credential... " _GREEN_("iCLASS SE"));
} else { } else {
PrintAndLogEx(SUCCESS, " CSN..-....... " _YELLOW_("outside HID range")); PrintAndLogEx(SUCCESS, " CSN.......... " _YELLOW_("outside HID range"));
} }
uint8_t cardtype = get_mem_config(hdr); uint8_t cardtype = get_mem_config(hdr);
PrintAndLogEx(SUCCESS, " Card type.... " _GREEN_("%s"), card_types[cardtype]); PrintAndLogEx(SUCCESS, " Card type.... " _GREEN_("%s"), card_types[cardtype]);
} }
DropField(); DropField();