#include "data.h"\r
#include "lfdemod.h"\r
#include "../common/crc.h"\r
+#include "../common/iso14443crc.h"\r
\r
-#define LF_TRACE_BUFF_SIZE 20000 // 32 x 32 x 10 (32 bit times numofblock (7), times clock skip..)\r
-#define LF_BITSSTREAM_LEN 1000 // more then 1000 bits shouldn't happend.. 8block * 4 bytes * 8bits = \r
-\r
-// Default configuration: ASK, not inversed.\r
-t55xx_conf_block_t config = { .modulation = 2, .inversed = FALSE, .block0 = 0x00};\r
+// Default configuration\r
+t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inversed = FALSE, .offset = 0x00, .block0 = 0x00};\r
\r
int usage_t55xx_config(){\r
- PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1]");\r
+ PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>]");\r
PrintAndLog("Options: ");\r
PrintAndLog(" h This help");\r
PrintAndLog(" d <FSK|ASK|PSK|NZ|BI> Set demodulation FSK / ASK / PSK / NZ / Biphase");\r
PrintAndLog(" i [1] Inverse data signal, defaults to normal");\r
+ PrintAndLog(" o [offset] Set offset, where data should start decode in bitstream");\r
PrintAndLog("");\r
PrintAndLog("Examples:");\r
- PrintAndLog(" lf t55xx config d FSK - FSK demodulation");\r
- PrintAndLog(" lf t55xx config d FSK i 1 - FSK demodulation, inverse data");\r
+ PrintAndLog(" lf t55xx config d FSK - FSK demodulation");\r
+ PrintAndLog(" lf t55xx config d FSK i 1 - FSK demodulation, inverse data");\r
+ PrintAndLog(" lf t55xx config d FSK i 1 o 3 - FSK demodulation, inverse data, offset=3,start from bitpos 3 to decode data");\r
PrintAndLog("");\r
return 0;\r
}\r
\r
int CmdT55xxSetConfig(const char *Cmd){\r
\r
- int len = 0;\r
- int foundModulation = 2;\r
- bool inverse = FALSE;\r
+ uint8_t offset = 0;\r
bool errors = FALSE;\r
uint8_t cmdp = 0;\r
char modulation[4] = {0x00};\r
+ char tmp = 0x00;\r
\r
while(param_getchar(Cmd, cmdp) != 0x00 && !errors)\r
{\r
- switch(param_getchar(Cmd, cmdp))\r
+ tmp = param_getchar(Cmd, cmdp);\r
+ switch(tmp)\r
{\r
case 'h':\r
case 'H':\r
return usage_t55xx_config();\r
case 'd':\r
- len = param_getstr(Cmd, cmdp+1, modulation);\r
- cmdp+= len+1;\r
- //FSK|ASK|PSK|NZ|BI\r
- if ( strcmp(modulation, "FSK" ) == 0)\r
- foundModulation = 1;\r
- else if ( strcmp(modulation, "ASK" ) == 0)\r
- foundModulation = 2;\r
- else if ( strcmp(modulation, "PSK" ) == 0)\r
- foundModulation = 3;\r
- else if ( strcmp(modulation, "NZ" ) == 0)\r
- foundModulation = 4;\r
- else if ( strcmp(modulation, "BI" ) == 0)\r
- foundModulation = 5;\r
+ param_getstr(Cmd, cmdp+1, modulation);\r
+ cmdp += 2;\r
+ \r
+ if ( strcmp(modulation, "FSK" ) == 0) config.modulation = DEMOD_FSK;\r
+ else if ( strcmp(modulation, "ASK" ) == 0) config.modulation = DEMOD_ASK;\r
+ else if ( strcmp(modulation, "PSK" ) == 0) config.modulation = DEMOD_PSK;\r
+ else if ( strcmp(modulation, "NZ" ) == 0) config.modulation = DEMOD_NZR;\r
+ else if ( strcmp(modulation, "BI" ) == 0) config.modulation = DEMOD_BI;\r
else {\r
PrintAndLog("Unknown modulation '%s'", modulation);\r
errors = TRUE;\r
}\r
break;\r
case 'i':\r
- inverse = param_getchar(Cmd,cmdp+1) == '1';\r
+ config.inversed = param_getchar(Cmd,cmdp+1) == '1';\r
cmdp+=2;\r
break;\r
+ case 'o':\r
+ errors |= param_getdec(Cmd, cmdp+1,&offset);\r
+ if ( !errors )\r
+ config.offset = offset;\r
+ cmdp += 2;\r
+ break;\r
default:\r
PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
errors = TRUE;\r
break;\r
}\r
+ \r
+ PrintAndLog(" %c %d [%d]", param_getchar(Cmd, cmdp) , errors, cmdp);\r
}\r
// No args\r
if (cmdp == 0) {\r
if (errors)\r
return usage_t55xx_config();\r
\r
- config.modulation = foundModulation;\r
- config.inversed = inverse;\r
config.block0 = 0;\r
+ printConfiguration( config );\r
return 0;\r
}\r
\r
++hits;\r
}\r
\r
- if ( PSKDemod("0 0 1", FALSE) && test()) {\r
+ if ( PSKDemod("0 0 1", FALSE) && test()) {\r
tests[hits].modulation = DEMOD_PSK;\r
tests[hits].inversed = FALSE;\r
++hits;\r
}\r
\r
if ( PSKDemod("0 1 1", FALSE) && test()) {\r
- tests[++hits].modulation = DEMOD_PSK;\r
+ tests[hits].modulation = DEMOD_PSK;\r
tests[hits].inversed = TRUE;\r
++hits;\r
}\r
if ( hits > 1) {\r
PrintAndLog("Found [%d] possible matches for modulation.",hits);\r
for(int i=0; i<hits; ++i){\r
+ PrintAndLog("--[%d]---------------", i+1);\r
printConfiguration( tests[i] );\r
}\r
}\r
if ( !DemodBufferLen) \r
return false;\r
\r
- uint8_t si = 1;\r
+ if ( PackBits(0, 32, DemodBuffer) == 0x00 )\r
+ return FALSE;\r
+ \r
+ uint8_t si = 0;\r
+ \r
uint8_t safer = PackBits(si, 4, DemodBuffer); si += 4; \r
uint8_t resv = PackBits(si, 7, DemodBuffer); si += 7+3;\r
uint8_t extend = PackBits(si, 1, DemodBuffer); si += 1;\r
void printT55xxBlock(const char *demodStr){\r
\r
uint32_t blockData = 0;\r
- uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
+ uint8_t bits[64] = {0x00};\r
\r
if ( !DemodBufferLen) \r
return;\r
\r
- int i =0;\r
- for (;i<DemodBufferLen;++i)\r
- bits[i]=DemodBuffer[i];\r
+ if ( config.offset > DemodBufferLen){\r
+ PrintAndLog("The configured offset is to big. (%d > %d)", config.offset, DemodBufferLen);\r
+ return;\r
+ }\r
+ \r
+ int i = config.offset;\r
+ int pos = 32 + config.offset;\r
+ for (; i < pos; ++i)\r
+ bits[i - config.offset]=DemodBuffer[i];\r
\r
- blockData = PackBits(1, 32, bits);\r
- PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits+1,32), demodStr);\r
+ blockData = PackBits(0, 32, bits);\r
+ PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits,32), demodStr);\r
+}\r
+\r
+int special(const char *Cmd) {\r
+ uint32_t blockData = 0;\r
+ uint8_t bits[32] = {0x00};\r
+\r
+ PrintAndLog("[OFFSET] [DATA] [BINARY]");\r
+ PrintAndLog("----------------------------------------------------");\r
+ int i,j = 0;\r
+ for (; j < 128; ++j){\r
+ \r
+ for (i = 0; i < 32; ++i)\r
+ bits[i]=DemodBuffer[j+i];\r
+ \r
+ blockData = PackBits(0, 32, bits);\r
+ PrintAndLog("[%d] 0x%08X %s",j , blockData, sprint_bin(bits,32)); \r
+ }\r
+ \r
+ return 0;\r
}\r
\r
void printConfiguration( t55xx_conf_block_t b){\r
PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );\r
PrintAndLog("Inverted : %s", (b.inversed) ? "Yes" : "No" );\r
+ PrintAndLog("Offset : %d", b.offset);\r
PrintAndLog("Block0 : %08X", b.block0);\r
PrintAndLog("");\r
}\r
\r
RepaintGraphWindow();\r
\r
- uint8_t si = 5;\r
+ uint8_t si = config.offset;\r
uint32_t bl0 = PackBits(si, 32, DemodBuffer);\r
uint32_t bl1 = PackBits(si+32, 32, DemodBuffer);\r
\r
return 2;\r
\r
\r
- uint8_t si = 1;\r
+ uint8_t si = config.offset;\r
uint32_t bl0 = PackBits(si, 32, DemodBuffer);\r
\r
uint32_t safer = PackBits(si, 4, DemodBuffer); si += 4; \r
{"trace", CmdT55xxReadTrace, 0, "[1] Show T55xx traceability data (page 1/ blk 0-1)"},\r
{"info", CmdT55xxInfo, 0, "[1] Show T55xx configuration data (page 0/ blk 0)"},\r
{"dump", CmdT55xxDump, 0, "[password] Dump T55xx card block 0-7. [optional password]"},\r
+ {"special", special, 0, "Shows how a datablock changes with 32 different offsets"},\r
{NULL, NULL, 0, NULL}\r
};\r
\r
projects / proxmark3-svn / blobdiff