FIX: Coverity, out-of-bounds read ...

[proxmark3-svn] / client / cmdlft55xx.h

diff --git a/client/cmdlft55xx.h b/client/cmdlft55xx.h
index 79e37cef7a8146c09d3951e345f5eb464169c041..1771742a09e1584f6bcb678738e40d8e47e73570 100644 (file)
--- a/client/cmdlft55xx.h
+++ b/client/cmdlft55xx.h
@@ -28,8 +28,48 @@
 #define T55X7_GUARDPROXII_CONFIG_BLOCK 0x00150060      // bitrate 64pcb, Direct modulation, Biphase, 3 data blocks\r
 #define T55X7_VIKING_CONFIG_BLOCK              0x00088040      // compat mode, data rate 32, Manchester, 2 data blocks\r
 #define T55X7_NORALYS_CONFIG_BLOCK             0x00088C6A      // compat mode,   (NORALYS - KCP3000)\r
 #define T55X7_GUARDPROXII_CONFIG_BLOCK 0x00150060      // bitrate 64pcb, Direct modulation, Biphase, 3 data blocks\r
 #define T55X7_VIKING_CONFIG_BLOCK              0x00088040      // compat mode, data rate 32, Manchester, 2 data blocks\r
 #define T55X7_NORALYS_CONFIG_BLOCK             0x00088C6A      // compat mode,   (NORALYS - KCP3000)\r

+#define T55X7_IOPROX_CONFIG_BLOCK              0x00147040  // maxblock 2\r

 #define T55X7_bin 0b0010\r
 \r
 #define T55X7_bin 0b0010\r
 \r

+#define T5555_DEFAULT_CONFIG_BLOCK             0x6001F004  // data rate 64 , ask, manchester, 2 data blocks?\r
+enum {\r
+       T55x7_RAW = 0x00,\r
+       T55x7_DEFAULT = 0x00,\r
+       T5555_DEFAULT = 0x01,\r
+       EM_UNIQUE  = 0x0,\r
+       FDBX = 0x02,\r
+       HID_26 = 0x03,\r
+       INDALA_64 = 0x04,\r
+       INDALA_224 = 0x05,\r
+       GUARDPROXXII = 0x06,\r
+       VIKING = 0x07,\r
+       NORALSYS = 0x08,\r
+       IOPROX = 0x09,\r
+} t55xx_tag;\r
+\r
+typedef struct {\r
+       uint32_t bl1;\r
+       uint32_t bl2; \r
+       uint32_t acl; \r
+       uint32_t mfc; \r
+       uint32_t cid; \r
+       uint32_t year; \r
+       uint32_t quarter; \r
+       uint32_t icr;\r
+       uint32_t lotid; \r
+       uint32_t wafer; \r
+       uint32_t dw;\r
+} t55xx_tracedata_t;\r
+\r
+typedef struct {\r
+       uint32_t bl1;\r
+       uint32_t bl2;\r
+       uint32_t icr;\r
+       char lotidc;\r
+       uint32_t lotid;\r
+       uint32_t wafer;\r
+       uint32_t dw;\r
+} t5555_tracedata_t;\r

 \r
 typedef struct {\r
        enum {\r
 \r
 typedef struct {\r
        enum {\r


@@ -74,6 +114,7 @@ int CmdT55xxInfo(const char *Cmd);
 int CmdT55xxDetect(const char *Cmd);\r
 int CmdResetRead(const char *Cmd);\r
 int CmdT55xxWipe(const char *Cmd);\r
 int CmdT55xxDetect(const char *Cmd);\r
 int CmdResetRead(const char *Cmd);\r
 int CmdT55xxWipe(const char *Cmd);\r

+int CmdT55xxBruteForce(const char *Cmd);\r

 \r
 char * GetBitRateStr(uint32_t id);\r
 char * GetSaferStr(uint32_t id);\r
 \r
 char * GetBitRateStr(uint32_t id);\r
 char * GetSaferStr(uint32_t id);\r


@@ -91,4 +132,9 @@ bool test(uint8_t mode, uint8_t *offset, int *fndBitRate, uint8_t clk, bool *Q5)
 int special(const char *Cmd);\r
 int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );\r
 \r
 int special(const char *Cmd);\r
 int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password );\r
 \r

+bool detectPassword(int password);\r
+\r
+void printT55xxTrace( t55xx_tracedata_t data, uint8_t repeat );\r
+void printT5555Trace( t5555_tracedata_t data, uint8_t repeat );\r
+\r

 #endif\r
 #endif\r