github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-07 21:51:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

update books to app_areas. clearer.

Browse source
This commit is contained in:
marshmellow42 2015-07-25 23:24:53 -04:00
parent b82d809852
commit bbd19beced
3 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/cmdhficlass.c
View file

@ -554,7 +554,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
uint8_t blockno = 0; uint8_t blockno = 0;
uint8_t numblks = 0; uint8_t numblks = 0;
uint8_t maxBlk = 31; uint8_t maxBlk = 31;
uint8_t books = 1; uint8_t app_areas = 1;
uint8_t kb = 2; uint8_t kb = 2;
uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; uint8_t KEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
uint8_t CreditKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; uint8_t CreditKEY[8] = {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
@ -668,7 +668,7 @@ int CmdHFiClassReader_Dump(const char *Cmd) {
memcpy(tag_data, data, 8*3); memcpy(tag_data, data, 8*3);
blockno+=2; // 2 to force re-read of block 2 later. (seems to respond differently..) blockno+=2; // 2 to force re-read of block 2 later. (seems to respond differently..)
numblks = data[8]; numblks = data[8];
getMemConfig(data[13], data[12], &maxBlk, &books, &kb); getMemConfig(data[13], data[12], &maxBlk, &app_areas, &kb);
// large memory - not able to dump pages currently // large memory - not able to dump pages currently
if (numblks > maxBlk) numblks = maxBlk; if (numblks > maxBlk) numblks = maxBlk;
} }

43
common/protocols.c
View file

@ -75,31 +75,32 @@ void fuse_config(const picopass_hdr *hdr)
else prnt(" RA: Read access not enabled"); else prnt(" RA: Read access not enabled");
} }
void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *books, uint8_t *kb) { void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb) {
// mem-bit 5, mem-bit 7, chip-bit 4: defines chip type // mem-bit 5, mem-bit 7, chip-bit 4: defines chip type
if(isset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) { if(isset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
kb = 2; *kb = 2;
books = 1; *app_areas = 2;
max_blk = 31; *max_blk = 31;
} else if(isset(chip_cfg, 0x10) && isset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) { } else if(isset(chip_cfg, 0x10) && isset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
kb = 16; *kb = 16;
books = 2; *app_areas = 2;
max_blk = 255; //16kb *max_blk = 255; //16kb
} else if(notset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) { } else if(notset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
kb = 16; *kb = 16;
books = 16; *app_areas = 16;
max_blk = 255; //16kb *max_blk = 255; //16kb
} else if(isset(chip_cfg, 0x10) && isset(mem_cfg, 0x80) && isset(mem_cfg, 0x20)) { } else if(isset(chip_cfg, 0x10) && isset(mem_cfg, 0x80) && isset(mem_cfg, 0x20)) {
kb = 32; *kb = 32;
books = 2; *app_areas = 3;
max_blk = 255; //16kb *max_blk = 255; //16kb
} else if(notset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && isset(mem_cfg, 0x20)) { } else if(notset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && isset(mem_cfg, 0x20)) {
kb = 32; *kb = 32;
books = 16; *app_areas = 17;
max_blk = 255; //16kb *max_blk = 255; //16kb
} else { } else {
kb = 32; *kb = 32;
max_blk = 255; *app_areas = 2;
*max_blk = 255;
} }
} }
@ -110,10 +111,10 @@ void mem_app_config(const picopass_hdr *hdr)
uint8_t applimit = hdr->conf.app_limit; uint8_t applimit = hdr->conf.app_limit;
if (applimit < 6) applimit = 26; if (applimit < 6) applimit = 26;
uint8_t kb = 2; uint8_t kb = 2;
uint8_t books = 1; uint8_t app_areas = 2;
uint8_t max_blk = 31; uint8_t max_blk = 31;
getMemConfig(mem, chip, &max_blk, &books, &kb); getMemConfig(mem, chip, &max_blk, &app_areas, &kb);
prnt(" Mem: %u KBits/%u Books (%u * 8 bytes) [%02X]", kb, books, max_blk, mem); prnt(" Mem: %u KBits/%u App Areas (%u * 8 bytes) [%02X]", kb, app_areas, max_blk, mem);
prnt(" AA1: blocks 06-%02X", applimit); prnt(" AA1: blocks 06-%02X", applimit);
prnt(" AA2: blocks %02X-%02X", applimit+1, max_blk); prnt(" AA2: blocks %02X-%02X", applimit+1, max_blk);
} }

2
common/protocols.h
View file

@ -196,6 +196,6 @@ NXP/Philips CUSTOM COMMANDS
void printIclassDumpInfo(uint8_t* iclass_dump); void printIclassDumpInfo(uint8_t* iclass_dump);
void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *books, uint8_t *kb); void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb);
#endif // PROTOCOLS_H #endif // PROTOCOLS_H