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

Merge pull request #1348 from pcunning/iclass_empty_config

Browse source 
iClass Updates - AA1 Size
This commit is contained in:
Iceman 2021-07-04 11:50:37 +02:00 • committed by GitHub
commit af5e550235
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/src/cmdhficlass.c
View file

@ -1653,6 +1653,9 @@ static int CmdHFiClassDump(const char *Cmd) {
app_limit1 = card_app2_limit[type]; app_limit1 = card_app2_limit[type];
app_limit2 = 0; app_limit2 = 0;
} else if (hdr->conf.app_limit >= hdr->conf.mem_config) {
PrintAndLogEx(WARNING, "AA1 config is >= card size, using card size as AA1 limit");
app_limit1 = card_app2_limit[type];
} else { } else {
app_limit1 = hdr->conf.app_limit; app_limit1 = hdr->conf.app_limit;
app_limit2 = card_app2_limit[type]; app_limit2 = card_app2_limit[type];
@ -1674,7 +1677,12 @@ static int CmdHFiClassDump(const char *Cmd) {
PrintAndLogEx(FAILED, "Run command with keys"); PrintAndLogEx(FAILED, "Run command with keys");
return PM3_ESOFT; return PM3_ESOFT;
} }
PrintAndLogEx(INFO, "Card has atleast 2 application areas. AA1 limit %u (0x%02X) AA2 limit %u (0x%02X)", app_limit1, app_limit1, app_limit2, app_limit2);
if (app_limit2 != 0) {
PrintAndLogEx(INFO, "Card has at least 2 application areas. AA1 limit %u (0x%02X) AA2 limit %u (0x%02X)", app_limit1, app_limit1, app_limit2, app_limit2);
} else {
PrintAndLogEx(INFO, "Card has 1 application area. AA1 limit %u (0x%02X)", app_limit1, app_limit1);
}
} }
iclass_dump_req_t payload = { iclass_dump_req_t payload = {
@ -1750,7 +1758,7 @@ static int CmdHFiClassDump(const char *Cmd) {
// AIA data // AIA data
memcpy(tag_data + (8 * 5), tempbuf + (8 * 5), 8); memcpy(tag_data + (8 * 5), tempbuf + (8 * 5), 8);
// AA1 data // AA1 data
memcpy(tag_data + (8 * 6), tempbuf + (8 * 6), (blocks_read * 8)); memcpy(tag_data + (8 * 6), tempbuf + (8 * 6), ((blocks_read - 6) * 8));
} }
uint16_t bytes_got = (app_limit1 + 1) * 8; uint16_t bytes_got = (app_limit1 + 1) * 8;
@ -1758,7 +1766,7 @@ static int CmdHFiClassDump(const char *Cmd) {
// try AA2 Kc, Credit // try AA2 Kc, Credit
bool aa2_success = false; bool aa2_success = false;
if (have_credit_key && pagemap != 0x01) { if (have_credit_key && pagemap != PICOPASS_NON_SECURE_PAGEMODE && app_limit2 != 0) {
// AA2 authenticate credit key // AA2 authenticate credit key
memcpy(payload.req.key, credit_key, 8); memcpy(payload.req.key, credit_key, 8);