#include "util.h"\r
#include "data.h"\r
\r
-#define LF_TRACE_BUFF_SIZE 16000\r
+\r
+#define LF_TRACE_BUFF_SIZE 12000 // 32 x 32 x 10 (32 bit times numofblock (7), times clock skip..)\r
static int CmdHelp(const char *Cmd);\r
\r
\r
SendCommand(&c);\r
WaitForResponse(CMD_ACK, NULL);\r
\r
- uint8_t data[LF_TRACE_BUFF_SIZE];\r
- memset(data, 0x00, LF_TRACE_BUFF_SIZE);\r
+ uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
\r
GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560); //3560 -- should be offset..\r
WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
\r
for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
- GraphBuffer[j] = ((int)data[j]) - 128;\r
+ GraphBuffer[j] = ((int)data[j]) ;\r
}\r
GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
- \r
- // BiDirectional\r
- //CmdDirectionalThreshold("70 60");\r
- \r
- // Askdemod\r
- //Cmdaskdemod("1");\r
\r
- uint8_t bits[1000];\r
+ uint8_t bits[1000] = {0x00};\r
uint8_t * bitstream = bits;\r
- memset(bitstream, 0x00, sizeof(bits));\r
\r
manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);\r
\r
+ RepaintGraphWindow();\r
return 0;\r
}\r
\r
-\r
int CmdReadBlkPWD(const char *Cmd)\r
{\r
int Block = -1; //default to invalid block\r
SendCommand(&c);\r
WaitForResponse(CMD_ACK, NULL);\r
\r
- uint8_t data[LF_TRACE_BUFF_SIZE];\r
- memset(data, 0x00, LF_TRACE_BUFF_SIZE);\r
+ uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
\r
GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560); //3560 -- should be offset..\r
WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
}\r
GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
\r
- // BiDirectional\r
- //CmdDirectionalThreshold("70 -60"); \r
- \r
- // Askdemod\r
- //Cmdaskdemod("1");\r
- \r
- uint8_t bits[1000];\r
+ uint8_t bits[1000] = {0x00};\r
uint8_t * bitstream = bits;\r
- memset(bitstream, 0x00, sizeof(bits));\r
\r
- manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);\r
+ manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream); \r
+ RepaintGraphWindow();\r
return 0;\r
}\r
\r
-\r
int CmdWriteBlk(const char *Cmd)\r
{\r
int Block = 8; //default to invalid block\r
\r
int CmdReadTrace(const char *Cmd)\r
{\r
- PrintAndLog(" Reading page 1 - tracedata");\r
-\r
- UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
- SendCommand(&c);\r
+ UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
+ SendCommand(&c);\r
WaitForResponse(CMD_ACK, NULL);\r
\r
- uint8_t data[LF_TRACE_BUFF_SIZE];\r
- memset(data, 0x00, LF_TRACE_BUFF_SIZE);\r
+ uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};\r
\r
GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560); //3560 -- should be offset..\r
WaitForResponseTimeout(CMD_ACK,NULL, 1500);\r
\r
for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {\r
- GraphBuffer[j] = ((int)data[j]) - 128;\r
+ GraphBuffer[j] = ((int)data[j]);\r
+ //GraphBuffer[j] = ((int)data[j]) - 128;\r
}\r
GraphTraceLen = LF_TRACE_BUFF_SIZE;\r
\r
- // BiDirectional\r
- //CmdDirectionalThreshold("70 -60"); \r
+ uint8_t bits[1000] = {0x00};\r
+ uint8_t * bitstream = bits;\r
\r
- // Askdemod\r
- //Cmdaskdemod("1");\r
+ manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);\r
+ RepaintGraphWindow();\r
\r
+ uint8_t si = 5;\r
+ uint32_t bl0 = PackBits(si, 32, bitstream);\r
+ uint32_t bl1 = PackBits(si+32, 32, bitstream);\r
+ \r
+ uint32_t acl = PackBits(si, 8, bitstream);\r
+ si += 8;\r
+ uint32_t mfc = PackBits(si, 8, bitstream);\r
+ si += 8;\r
+ uint32_t cid = PackBits(si, 5, bitstream);\r
+ si += 5;\r
+ uint32_t icr = PackBits(si, 3, bitstream);\r
+ si += 3;\r
+ uint32_t year = PackBits(si, 4, bitstream);\r
+ si += 4;\r
+ uint32_t quarter = PackBits(si, 2, bitstream);\r
+ si += 2;\r
+ uint32_t num = PackBits(si, 12, bitstream);\r
+ si += 12;\r
+ uint32_t wafer = PackBits(si, 5, bitstream);\r
+ si += 5;\r
+ uint32_t dw = PackBits(si, 15, bitstream);\r
+ \r
+ PrintAndLog("");\r
+ PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1) : 0x%02X (%d)", acl, acl);\r
+ PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6) : 0x%02X (%d)", mfc, mfc);\r
+ PrintAndLog(" CID : 0x%02X (%d)", cid, cid);\r
+ PrintAndLog(" ICR IC Revision : %d",icr );\r
+ PrintAndLog(" Manufactured");\r
+ PrintAndLog(" Year/Quarter : %d/%d",2000+year, quarter );\r
+ PrintAndLog(" Number : %d", num );\r
+ PrintAndLog(" Wafer number : %d", wafer);\r
+ PrintAndLog(" Die Number : %d", dw);\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ PrintAndLog(" Raw Data");\r
+ PrintAndLog(" Block 0 : %08X", bl0);\r
+ PrintAndLog(" Block 1 : %08X", bl1);\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ /*\r
+ TRACE - BLOCK O\r
+ Bits Definition HEX\r
+ 1-8 ACL Allocation class (ISO/IEC 15963-1) 0xE0 \r
+ 9-16 MFC Manufacturer ID (ISO/IEC 7816-6) 0x15 Atmel Corporation\r
+ 17-21 CID 0x1 = Atmel ATA5577M1 0x2 = Atmel ATA5577M2 \r
+ 22-24 ICR IC revision\r
+ 25-28 YEAR (BCD encoded) 9 (= 2009)\r
+ 29-30 QUARTER 1,2,3,4 \r
+ 31-32 Number\r
+ \r
+ TRACE - BLOCK 1\r
+ 1-12 Number\r
+ 13-17 Wafer number\r
+ 18-32 DW, die number sequential\r
+ */\r
+ \r
+ return 0;\r
+}\r
\r
- uint8_t bits[1000];\r
+int CmdInfo(const char *Cmd){\r
+ /*\r
+ Page 0 Block 0 Configuration data.\r
+ Normal mode\r
+ Extended mode\r
+ */\r
+ // läs block 0 - data finns i graphbuff\r
+ CmdReadBlk("0");\r
+ \r
+ uint8_t bits[1000] = {0x00};\r
uint8_t * bitstream = bits;\r
- memset(bitstream, 0x00, sizeof(bits));\r
\r
manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);\r
+ \r
+ uint8_t si = 5;\r
+ uint32_t bl0 = PackBits(si, 32, bitstream);\r
+ \r
+ uint32_t safer = PackBits(si, 4, bitstream); si += 4; \r
+ uint32_t resv = PackBits(si, 7, bitstream); si += 7;\r
+ uint32_t dbr = PackBits(si, 3, bitstream); si += 3;\r
+ uint32_t extend = PackBits(si, 1, bitstream); si += 1;\r
+ uint32_t datamodulation = PackBits(si, 5, bitstream); si += 5;\r
+ uint32_t pskcf = PackBits(si, 2, bitstream); si += 2;\r
+ uint32_t aor = PackBits(si, 1, bitstream); si += 1; \r
+ uint32_t otp = PackBits(si, 1, bitstream); si += 1; \r
+ uint32_t maxblk = PackBits(si, 3, bitstream); si += 3;\r
+ uint32_t pwd = PackBits(si, 1, bitstream); si += 1; \r
+ uint32_t sst = PackBits(si, 1, bitstream); si += 1; \r
+ uint32_t fw = PackBits(si, 1, bitstream); si += 1;\r
+ uint32_t inv = PackBits(si, 1, bitstream); si += 1; \r
+ uint32_t por = PackBits(si, 1, bitstream); si += 1;\r
\r
- return 0;\r
+ PrintAndLog("");\r
+ PrintAndLog("-- T55xx Configuration --------------------------------------");\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ PrintAndLog(" Safer key : %s", GetSaferStr(safer));\r
+ PrintAndLog(" reserved : %d", resv);\r
+ PrintAndLog(" Data bit rate : %s", GetBitRateStr(dbr));\r
+ PrintAndLog(" eXtended mode : %s", (extend) ? "Yes - Warning":"No");\r
+ PrintAndLog(" Modulation : %s", GetModulationStr(datamodulation) );\r
+ PrintAndLog(" PSK clock freq : %d", pskcf);\r
+ PrintAndLog(" AOR - Answer on Request : %s", (aor) ? "Yes":"No");\r
+ PrintAndLog(" OTP - One Time Pad : %s", (otp) ? "Yes - Warning":"No" );\r
+ PrintAndLog(" Max block : %d", maxblk);\r
+ PrintAndLog(" Password mode : %s", (pwd) ? "Yes":"No");\r
+ PrintAndLog(" Sequence Start Terminator : %s", (sst) ? "Yes":"No");\r
+ PrintAndLog(" Fast Write : %s", (fw) ? "Yes":"No");\r
+ PrintAndLog(" Inverse data : %s", (inv) ? "Yes":"No");\r
+ PrintAndLog(" POR-Delay : %s", (por) ? "Yes":"No");\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ PrintAndLog(" Raw Data");\r
+ PrintAndLog(" Block 0 : 0x%08X", bl0);\r
+ PrintAndLog("-------------------------------------------------------------");\r
+ \r
+ return 0;\r
+}\r
+\r
+char * GetBitRateStr(uint32_t id){\r
+ static char buf[40];\r
+ char *retStr = buf;\r
+ switch (id){\r
+ case 0: \r
+ sprintf(retStr,"%d - RF/8",id);\r
+ break;\r
+ case 1:\r
+ sprintf(retStr,"%d - RF/16",id);\r
+ break;\r
+ case 2: \r
+ sprintf(retStr,"%d - RF/32",id);\r
+ break;\r
+ case 3:\r
+ sprintf(retStr,"%d - RF/40",id);\r
+ break;\r
+ case 4:\r
+ sprintf(retStr,"%d - RF/50",id);\r
+ break;\r
+ case 5:\r
+ sprintf(retStr,"%d - RF/64",id);\r
+ break;\r
+ case 6:\r
+ sprintf(retStr,"%d - RF/100",id);\r
+ break;\r
+ case 7:\r
+ sprintf(retStr,"%d - RF/128",id);\r
+ break;\r
+ default:\r
+ sprintf(retStr,"%d - (Unknown)",id);\r
+ break;\r
+ }\r
+\r
+ return buf;\r
+}\r
+\r
+\r
+char * GetSaferStr(uint32_t id){\r
+ static char buf[40];\r
+ char *retStr = buf;\r
+ \r
+ sprintf(retStr,"%d",id);\r
+ if (id == 6) {\r
+ sprintf(retStr,"%d - pasdwd",id);\r
+ }\r
+ if (id == 9 ){\r
+ sprintf(retStr,"%d - testmode ",id);\r
+ }\r
+ \r
+ return buf;\r
+}\r
+char * GetModulationStr( uint32_t id){\r
+ static char buf[40];\r
+ char *retStr = buf;\r
+ \r
+ switch (id){\r
+ case 0: \r
+ sprintf(retStr,"%d - direct",id);\r
+ break;\r
+ case 1:\r
+ sprintf(retStr,"%d - PSK 1 phase change when input changes",id);\r
+ break;\r
+ case 2: \r
+ sprintf(retStr,"%d - PSK 2 phase change on bitclk if input high",id);\r
+ break;\r
+ case 3:\r
+ sprintf(retStr,"%d - PSK 3 phase change on rising edge of input",id);\r
+ break;\r
+ case 4:\r
+ sprintf(retStr,"%d - FSK 1 RF/8 RF/5",id);\r
+ break;\r
+ case 5:\r
+ sprintf(retStr,"%d - FSK 2 RF/8 RF/10",id);\r
+ break;\r
+ case 6:\r
+ sprintf(retStr,"%d - FSK 1a RF/5 RF/8",id);\r
+ break;\r
+ case 7:\r
+ sprintf(retStr,"%d - FSK 2a RF/10 RF/8",id);\r
+ break;\r
+ case 8:\r
+ sprintf(retStr,"%d - Manschester",id);\r
+ break;\r
+ case 16:\r
+ sprintf(retStr,"%d - Biphase",id);\r
+ break;\r
+ case 17:\r
+ sprintf(retStr,"%d - Reserved",id);\r
+ break;\r
+ default:\r
+ sprintf(retStr,"0x%02X (Unknown)",id);\r
+ break;\r
+ }\r
+ return buf;\r
+}\r
+\r
+\r
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){\r
+ \r
+ int i = start;\r
+ int j = len-1;\r
+ uint32_t tmp = 0;\r
+ for (; j >= 0; --j, ++i){\r
+ tmp |= bits[i] << j;\r
+ }\r
+ return tmp;\r
}\r
\r
static command_t CommandTable[] =\r
{"wr", CmdWriteBlk, 0, "<Data> <Block> -- Write T55xx block data (page 0)"},\r
{"wrPWD", CmdWriteBlkPWD, 0, "<Data> <Block> <Password> -- Write T55xx block data in password mode(page 0)"},\r
{"trace", CmdReadTrace, 0, "Read T55xx traceability data (page 1)"},\r
+ {"info", CmdInfo, 0, "Read T55xx configuration data (page 0 / block 0"},\r
{NULL, NULL, 0, NULL}\r
};\r
\r
projects / proxmark3-svn / blobdiff