ADD: @marshmellows42 's fixes for "lf cmdread" and CHANGELOG.md

[proxmark3-svn] / common / protocols.c

diff --git a/common/protocols.c b/common/protocols.c
index bdaff3f148703a09bbe7ab286247cb5cc53858fb..0a523da3ab993021fc13318903c3114a9326c16c 100644 (file)
--- a/common/protocols.c
+++ b/common/protocols.c
@@ -1,17 +1,23 @@
-#include <stdio.h>

 #include <strings.h>
 #include <strings.h>

+#include <string.h>

 #include <stdint.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdarg.h>

+#include "protocols.h"
+#ifndef ON_DEVICE
+#include "ui.h"
+#define prnt PrintAndLog
+#endif
+

 
 
 typedef struct {
 
 
 typedef struct {

-       uint8_t app_limit;
-       uint8_t otp[2];
-       uint8_t block_writelock;
-       uint8_t chip_config;
-       uint8_t mem_config;
-       uint8_t eas;
-       uint8_t fuses;
+       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;
 
 
 }picopass_conf_block;
 
 


@@ -25,17 +31,9 @@ typedef struct {
 
 }picopass_hdr;
 
 
 }picopass_hdr;
 

-#define FUSE_FPERS   0x80
-#define FUSE_CODING1 0x40
-#define FUSE_CODING0 0x20
-#define FUSE_CRYPT1  0x10
-#define FUSE_CRYPT0  0x08
-#define FUSE_FPROD1  0x04
-#define FUSE_FPROD0  0x02
-#define FUSE_RA      0x01

 
 //#define prnt printf
 
 //#define prnt printf

-void prnt(char *fmt,...)
+/*void prnt(char *fmt,...)

 {
        va_list argptr;
        va_start(argptr, fmt);
 {
        va_list argptr;
        va_start(argptr, fmt);


@@ -44,7 +42,7 @@ void prnt(char *fmt,...)
        va_end(argptr);
        printf("\n");
 }
        va_end(argptr);
        printf("\n");
 }

-
+*/

 uint8_t isset(uint8_t val, uint8_t mask)
 {
        return (val & mask);
 uint8_t isset(uint8_t val, uint8_t mask)
 {
        return (val & mask);


@@ -76,25 +74,63 @@ void fuse_config(const picopass_hdr *hdr)
        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 mem_config(const picopass_hdr *hdr)
-{
-       uint8_t mem = hdr->conf.mem_config;
-       if( isset (mem, 0x80)) prnt("   Mem: 16KBits (255 * 8 bytes)");
-       else prnt("     Mem: 2 KBits ( 32 * 8 bytes)");

 
 

+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)) {
+               *kb = 2;
+               *app_areas = 2;
+               *max_blk = 31;
+       } else if(isset(chip_cfg, 0x10) && isset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
+               *kb = 16;
+               *app_areas = 2;
+               *max_blk = 255; //16kb
+       } else if(notset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && notset(mem_cfg, 0x20)) {
+               *kb = 16;
+               *app_areas = 16;
+               *max_blk = 255; //16kb
+       } else if(isset(chip_cfg, 0x10) && isset(mem_cfg, 0x80) && isset(mem_cfg, 0x20)) {
+               *kb = 32;
+               *app_areas = 3;
+               *max_blk = 255; //16kb
+       } else if(notset(chip_cfg, 0x10) && notset(mem_cfg, 0x80) && isset(mem_cfg, 0x20)) {
+               *kb = 32;
+               *app_areas = 17;
+               *max_blk = 255; //16kb
+       } else {
+               *kb = 32;
+               *app_areas = 2;
+               *max_blk = 255;
+       }

 }
 }

-void applimit_config(const picopass_hdr *hdr)
+
+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;
        uint8_t applimit = hdr->conf.app_limit;

-       prnt("  AA1: blocks 6-%d", applimit);
-       prnt("  AA2: blocks %d-", (applimit+1));
+       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);
+       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);

 }
 void print_picopass_info(const picopass_hdr *hdr)
 {
        fuse_config(hdr);
 }
 void print_picopass_info(const picopass_hdr *hdr)
 {
        fuse_config(hdr);

-       mem_config(hdr);
-       applimit_config(hdr);
+       mem_app_config(hdr);

 }
 }

+void printIclassDumpInfo(uint8_t* iclass_dump)
+{
+//     picopass_hdr hdr;
+//     memcpy(&hdr, iclass_dump, sizeof(picopass_hdr));
+       print_picopass_info((picopass_hdr *) iclass_dump);
+}
+
+/*

 void test()
 {
        picopass_hdr hdr = {0x27,0xaf,0x48,0x01,0xf9,0xff,0x12,0xe0,0x12,0xff,0xff,0xff,0x7f,0x1f,0xff,0x3c};
 void test()
 {
        picopass_hdr hdr = {0x27,0xaf,0x48,0x01,0xf9,0xff,0x12,0xe0,0x12,0xff,0xff,0xff,0x7f,0x1f,0xff,0x3c};


@@ -106,3 +142,4 @@ int main(int argc, char *argv[])
        test();
        return 0;
 }
        test();
        return 0;
 }

+*/