CHG: 'hf iclass readblk' - should be able to read block 0,1 on all cards without key.

CHG: 'hf iclass reader' -  two rules according to datasheet
  if app_limit is less than 0x6,  app_limit should be 0x6
  if app_limit is bigger than 31/0x1F on 2kb picopass,  the app_limit should be 26/0x1A
This commit is contained in:
iceman1001 2017-07-05 12:05:53 +02:00
commit dd98b934bc
3 changed files with 48 additions and 5 deletions

View file

@ -95,12 +95,15 @@ void mem_app_config(const picopass_hdr *hdr) {
uint8_t mem = hdr->conf.mem_config;
uint8_t chip = hdr->conf.chip_config;
uint8_t applimit = hdr->conf.app_limit;
if (applimit < 6) applimit = 26;
uint8_t kb = 2;
uint8_t app_areas = 2;
uint8_t max_blk = 31;
getMemConfig(mem, chip, &max_blk, &app_areas, &kb);
if (applimit < 6) applimit = 26;
if (kb == 2 && (applimit > 0x1f) ) applimit = 26;
prnt(" Mem: %u KBits/%u App Areas (%u * 8 bytes) [%02X]", kb, app_areas, max_blk, mem);
prnt(" AA1: blocks 06-%02X", applimit);
prnt(" AA2: blocks %02X-%02X", applimit+1, max_blk);