github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-29 19:18:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

update iClass chip identification

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

11
client/cmdhficlass.c
View file

@ -554,6 +554,8 @@ 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 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};
uint8_t keyNbr = 0; uint8_t keyNbr = 0;
@ -666,13 +668,8 @@ 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);
if (data[13] & 0x80) { // large memory - not able to dump pages currently
// large memory - not able to dump pages currently
maxBlk = 255;
} else {
maxBlk = 31;
}
if (numblks > maxBlk) numblks = maxBlk; if (numblks > maxBlk) numblks = maxBlk;
} }
ul_switch_off_field(); ul_switch_off_field();

63
common/protocols.c
View file

@ -11,13 +11,13 @@
typedef struct { typedef struct {
uint8_t app_limit; uint8_t app_limit; //[8]
uint8_t otp[2]; uint8_t otp[2]; //[9-10]
uint8_t block_writelock; uint8_t block_writelock;//[11]
uint8_t chip_config; uint8_t chip_config; //[12]
uint8_t mem_config; uint8_t mem_config; //[13]
uint8_t eas; uint8_t eas; //[14]
uint8_t fuses; uint8_t fuses; //[15]
}picopass_conf_block; }picopass_conf_block;
@ -74,25 +74,48 @@ void fuse_config(const picopass_hdr *hdr)
if( isset( fuses, FUSE_RA)) prnt(" RA: Read access enabled"); if( isset( fuses, FUSE_RA)) prnt(" RA: Read access enabled");
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) {
// 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)) {
kb = 2;
books = 1;
max_blk = 31;
} else if(isset(chip_cfg, 0x10) && isset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
kb = 16;
books = 2;
max_blk = 255; //16kb
} else if(notset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
kb = 16;
books = 16;
max_blk = 255; //16kb
} else if(isset(chip_cfg, 0x10) && isset(mem_cfg, 0x80) && isset(mem_cfg, 0x20)) {
kb = 32;
books = 2;
max_blk = 255; //16kb
} else if(notset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && isset(mem_cfg, 0x20)) {
kb = 32;
books = 16;
max_blk = 255; //16kb
} else {
kb = 32;
max_blk = 255;
}
}
void mem_app_config(const picopass_hdr *hdr) void mem_app_config(const picopass_hdr *hdr)
{ {
uint8_t mem = hdr->conf.mem_config; uint8_t mem = hdr->conf.mem_config;
uint8_t chip = hdr->conf.chip_config;
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 maxBlk = 32; uint8_t books = 1;
if( isset(mem, 0x10) && notset(mem, 0x80)){ uint8_t max_blk = 31;
// 2kb default getMemConfig(mem, chip, &max_blk, &books, &kb);
} else if( isset(mem, 0x80) && notset(mem, 0x10)){ prnt(" Mem: %u KBits/%u Books (%u * 8 bytes) [%02X]", kb, books, max_blk, mem);
kb = 16;
maxBlk = 255; //16kb
} else {
kb = 32;
maxBlk = 255;
}
prnt(" Mem: %u KBits ( %u * 8 bytes) [%02X]", kb, maxBlk, mem);
prnt(" AA1: blocks 06-%02X", applimit); prnt(" AA1: blocks 06-%02X", applimit);
prnt(" AA2: blocks %02X-%02X", (applimit+1), (hdr->conf.mem_config)); prnt(" AA2: blocks %02X-%02X", applimit+1, max_blk);
} }
void print_picopass_info(const picopass_hdr *hdr) void print_picopass_info(const picopass_hdr *hdr)
{ {

3
common/protocols.h
View file

@ -99,7 +99,7 @@ NXP/Philips CUSTOM COMMANDS
#define ICLASS_CMD_CHECK 0x05 #define ICLASS_CMD_CHECK 0x05
#define ICLASS_CMD_DETECT 0x0F #define ICLASS_CMD_DETECT 0x0F
#define ICLASS_CMD_HALT 0x00 #define ICLASS_CMD_HALT 0x00
#define ICLASS_CMD_UPDATE 0x87 #define ICLASS_CMD_UPDATE 0x87
#define ICLASS_CMD_ACT 0x8E #define ICLASS_CMD_ACT 0x8E
#define ICLASS_CMD_READ4 0x06 #define ICLASS_CMD_READ4 0x06
@ -196,5 +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);
#endif // PROTOCOLS_H #endif // PROTOCOLS_H