CHG: @Marshmellow42 's fixes. ref: https://github.com/marshmellow42/proxmark3/commi...

[proxmark3-svn] / common / protocols.h

diff --git a/common/protocols.h b/common/protocols.h
index 0182ceb5d0b5b9849f38cbb12458495c4660c5e4..96a4b178bed0d1fd3346ea1eabb246a14373132b 100644 (file)
--- a/common/protocols.h
+++ b/common/protocols.h
@@ -1,6 +1,11 @@
 #ifndef PROTOCOLS_H
 #define PROTOCOLS_H
 
+#include <string.h>
+#include <stdint.h>
+#include <stdarg.h>
+
+
 //The following data is taken from http://www.proxmark.org/forum/viewtopic.php?pid=13501#p13501
 /*
 ISO14443A (usually NFC tags)
@@ -326,9 +331,13 @@ ISO 7816-4 Basic interindustry commands. For command APDU's.
 #define     MFDES_AUTHENTICATION_FRAME                  0xAF
 
 // LEGIC Commands
-#define        LEGIC_HSK       0xFF
-#define                LEGIC_READ      0x01
-#define        LEGIC_WRITE     0x00
+#define                LEGIC_MIM_22    0x0D
+#define                LEGIC_MIM_256   0x1D
+#define                LEGIC_MIM_1024  0x3D
+#define        LEGIC_ACK_22    0x19
+#define        LEGIC_ACK_256   0x39
+#define                LEGIC_READ              0x01
+#define        LEGIC_WRITE             0x00
 
 void printIclassDumpInfo(uint8_t* iclass_dump);
 void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *app_areas, uint8_t *kb);
@@ -385,5 +394,27 @@ void getMemConfig(uint8_t mem_cfg, uint8_t chip_cfg, uint8_t *max_blk, uint8_t *
 
 uint32_t GetT55xxClockBit(uint32_t clock);
 
+// 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;
+
+
 #endif 
 // PROTOCOLS_H