FIX: 'hw tune' - peakf shouldn't be compare with voltages limits :)

[proxmark3-svn] / common / protocols.c

diff --git a/common/protocols.c b/common/protocols.c
index 50eaf4930334476591157dd41da5c84bb21edc1b..420d575ad108ae7a64069f73d617cca467cb4aba 100644 (file)
--- a/common/protocols.c
+++ b/common/protocols.c
@@ -22,27 +22,6 @@ uint32_t GetT55xxClockBit(uint32_t clock) {
 #include "ui.h"
 #define prnt PrintAndLog
 
-// iclass / picopass chip config structures and shared routines
-typedef struct {
-       uint8_t app_limit;      //[8]
-       uint8_t otp[2];         //[9-10]
-       uint8_t block_writelock;//[11]
-       uint8_t chip_config;    //[12]
-       uint8_t mem_config;     //[13]
-       uint8_t eas;            //[14]
-       uint8_t fuses;          //[15]
-} picopass_conf_block;
-
-
-typedef struct {
-       uint8_t csn[8];
-       picopass_conf_block conf;
-       uint8_t epurse[8];
-       uint8_t key_d[8];
-       uint8_t key_c[8];
-       uint8_t app_issuer_area[8];
-} picopass_hdr;
-
 uint8_t isset(uint8_t val, uint8_t mask) {
        return (val & mask);
 }
@@ -54,44 +33,53 @@ uint8_t notset(uint8_t val, uint8_t mask){
 void fuse_config(const picopass_hdr *hdr) {
        uint8_t fuses = hdr->conf.fuses;
 
-       if (isset(fuses,FUSE_FPERS))prnt("      Mode: Personalization [Programmable]");
-       else prnt("     Mode: Application [Locked]");
+       if (isset(fuses,FUSE_FPERS)) 
+               prnt("  Mode: Personalization [Programmable]");
+       else 
+               prnt("  Mode: Application [Locked]");
 
-       if (isset(fuses, FUSE_CODING1))
+       if (isset(fuses, FUSE_CODING1)) {
                prnt("  Coding: RFU");
-       else
-       {
-               if( isset( fuses , FUSE_CODING0)) prnt("        Coding: ISO 14443-2 B/ISO 15693");
-               else prnt("     Coding: ISO 14443B only");
+       } else {
+               if( isset( fuses , FUSE_CODING0)) 
+                       prnt("  Coding: ISO 14443-2 B/ISO 15693");
+               else 
+                       prnt("  Coding: ISO 14443B only");
        }
        if( isset (fuses,FUSE_CRYPT1 | FUSE_CRYPT0 )) prnt("    Crypt: Secured page, keys not locked");
        if( isset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) prnt("   Crypt: Secured page, keys not locked");
        if( notset (fuses,FUSE_CRYPT1) && isset( fuses, FUSE_CRYPT0 )) prnt("   Crypt: Non secured page");
        if( notset (fuses,FUSE_CRYPT1) && notset( fuses, FUSE_CRYPT0 )) prnt("  Crypt: No auth possible. Read only if RA is enabled");
 
-       if( isset( fuses, FUSE_RA)) prnt("      RA: Read access enabled");
-       else prnt("     RA: Read access not enabled");
+       if( isset( fuses, FUSE_RA))
+               prnt("  RA: Read access enabled");
+       else 
+               prnt("  RA: Read access not enabled");
 }
 
 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
-       if(isset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
+       uint8_t k16             = isset(mem_cfg, 0x80);
+       //uint8_t k2            = isset(mem_cfg, 0x08);
+       uint8_t book    = isset(mem_cfg, 0x20);
+       
+       if(isset(chip_cfg, 0x10) && !k16 && !book) {
                *kb = 2;
                *app_areas = 2;
                *max_blk = 31;
-       } else if(isset(chip_cfg, 0x10) && isset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
+       } else if(isset(chip_cfg, 0x10) && k16 && !book) {
                *kb = 16;
                *app_areas = 2;
                *max_blk = 255; //16kb
-       } else if(notset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
+       } else if(notset(chip_cfg, 0x10) && !k16 && !book) {
                *kb = 16;
                *app_areas = 16;
                *max_blk = 255; //16kb
-       } else if(isset(chip_cfg, 0x10) && isset(mem_cfg, 0x80) && isset(mem_cfg, 0x20)) {
+       } else if(isset(chip_cfg, 0x10) && k16 && book) {
                *kb = 32;
                *app_areas = 3;
                *max_blk = 255; //16kb
-       } else if(notset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && isset(mem_cfg, 0x20)) {
+       } else if(notset(chip_cfg, 0x10) && !k16 && book) {
                *kb = 32;
                *app_areas = 17;
                *max_blk = 255; //16kb
@@ -114,6 +102,26 @@ void mem_app_config(const picopass_hdr *hdr) {
        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);
+       
+       prnt("");
+       uint8_t book = isset(mem, 0x20);
+       if (book) {
+               prnt("KeyAccess:");
+               prnt("\tRead A - Kd");
+               prnt("\tRead B - Kc");
+               prnt("\tWrite A - Kd");
+               prnt("\tWrite B - Kc");
+               prnt("\tDebit  - Kd or Kc");
+               prnt("\tCredit - Kc");
+       } else{
+               prnt("KeyAccess:");
+               prnt("\tRead A - Kd or Kc");
+               prnt("\tRead B - Kd or Kc");
+               prnt("\tWrite A - Kc");
+               prnt("\tWrite B - Kc");
+               prnt("\tDebit  - Kd or Kc");
+               prnt("\tCredit - Kc");
+       }
 }
 void print_picopass_info(const picopass_hdr *hdr) {
        fuse_config(hdr);