#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
-\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 [offsett] Set offset, where data should start decode from 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
+ uint8_t data[] = {0x78,0x00,0x00,0x00,0x00,0x00,0x00};\r
+ uint8_t cmd[] = {0x00,0x00};\r
+ ComputeCrc14443(CRC_14443_B, data, 7 , &cmd[0], &cmd[1]);\r
+ PrintAndLog("%02X %02X",cmd[0], cmd[1]);\r
int len = 0;\r
int foundModulation = 2;\r
+ uint8_t offset = 0;\r
bool inverse = FALSE;\r
bool errors = FALSE;\r
uint8_t cmdp = 0;\r
inverse = param_getchar(Cmd,cmdp+1) == '1';\r
cmdp+=2;\r
break;\r
+ case 'o':\r
+ errors |= param_getdec(Cmd, cmdp+1,&offset);\r
+ if ( offset >= 32 ){\r
+ PrintAndLog("Offset must be smaller than 32");\r
+ errors = TRUE;\r
+ }\r
+ cmdp+=2;\r
+ break;\r
default:\r
PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));\r
errors = TRUE;\r
\r
config.modulation = foundModulation;\r
config.inversed = inverse;\r
+ config.offset = offset;\r
config.block0 = 0;\r
return 0;\r
}\r
char buf[6] = {0x00};\r
char *cmdStr = buf;\r
\r
+ // clearing the DemodBuffer.\r
+ DemodBufferLen = 0x00;\r
+ \r
// use the configuration\r
switch( config.modulation ){\r
case 1:\r
\r
if (GetFskClock("", FALSE, FALSE)){ \r
if ( FSKrawDemod("0 0", FALSE) && test()){\r
- tests[hits].modulation = 1;\r
- tests[hits].inversed = 0;\r
+ tests[hits].modulation = DEMOD_FSK;\r
+ tests[hits].inversed = FALSE;\r
++hits;\r
}\r
if ( FSKrawDemod("0 1", FALSE) && test()) {\r
- tests[hits].modulation = 1;\r
- tests[hits].inversed = 1;\r
+ tests[hits].modulation = DEMOD_FSK;\r
+ tests[hits].inversed = TRUE;\r
++hits;\r
}\r
} else {\r
if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) {\r
- tests[hits].modulation = 2;\r
- tests[hits].inversed = 0;\r
+ tests[hits].modulation = DEMOD_ASK;\r
+ tests[hits].inversed = FALSE;\r
++hits;\r
}\r
\r
if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test()) {\r
- tests[hits].modulation = 2;\r
- tests[hits].inversed = 1;\r
+ tests[hits].modulation = DEMOD_ASK;\r
+ tests[hits].inversed = TRUE;\r
++hits;\r
}\r
\r
if ( NRZrawDemod("0 0 1", FALSE) && test()) {\r
- tests[hits].modulation = 3;\r
- tests[hits].inversed = 0;\r
+ tests[hits].modulation = DEMOD_NZR;\r
+ tests[hits].inversed = FALSE;\r
++hits;\r
}\r
\r
if ( NRZrawDemod("0 1 1", FALSE) && test()) {\r
- tests[hits].modulation = 3;\r
- tests[hits].inversed = 1;\r
+ tests[hits].modulation = DEMOD_NZR;\r
+ tests[hits].inversed = TRUE;\r
++hits;\r
}\r
\r
- if ( PSKDemod("0 0 1", FALSE) && test()) {\r
- tests[hits].modulation = 4;\r
- tests[hits].inversed = 0;\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 = 4;\r
- tests[hits].inversed = 1;\r
+ tests[hits].modulation = DEMOD_PSK;\r
+ tests[hits].inversed = TRUE;\r
++hits;\r
}\r
//PSK2?\r
// if (!BiphaseRawDecode("0",FALSE) && test()) {\r
- // tests[++hits].modulation = 5;\r
- // tests[hits].inversed = 0;\r
+ // tests[++hits].modulation = DEMOD_BI;\r
+ // tests[hits].inversed = FALSE;\r
//}\r
// if (!BiphaseRawDecode("1",FALSE) && test()) {\r
- // tests[++hits].modulation = 5;\r
- // tests[hits].inversed = 1;\r
+ // tests[++hits].modulation = DEMOD_BI;\r
+ // tests[hits].inversed = TRUE;\r
// }\r
} \r
if ( hits == 1) {\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
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
+ 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]=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[64] = {0x00};\r
+\r
+ PrintAndLog("[OFFSET] [DATA] [BINARY]");\r
+ PrintAndLog("----------------------------------------------------");\r
+ int i,j = 0;\r
+ for (; j < 32; ++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
-/*\r
-FSK1 / FSK1a\r
-size = fskdemod(dest, size, 32, 0, 8, 10); // fsk1 RF/32 \r
-size = fskdemod(dest, size, 32, 1, 8, 10); // fsk1a RF/32 \r
-\r
-FSK2 / FSK2a\r
-size = fskdemod(dest, size, 32, 0, 10, 8); // fsk2 RF/32 \r
-size = fskdemod(dest, size, 32, 1, 10, 8); // fsk2a RF/32 \r
-size = fskdemod(dest, size, 50, 1, 10, 8); // fsk2a RF/50 \r
-size = fskdemod(dest, size, 64, 1, 10, 8); // FSK2a RF/64 \r
-\r
-PSK1\r
-errCnt = pskRawDemod(bits, &bitlen, 32, 0);\r
-*/\r
int CmdT55xxWriteBlock(const char *Cmd)\r
{\r
int block = 8; //default to invalid block\r
PrintAndLog("-------------------------------------------------------------");\r
PrintAndLog(" Raw Data - Page 1");\r
PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+5,32) );\r
- PrintAndLog(" Block 0 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+37,32) );\r
+ PrintAndLog(" Block 1 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+37,32) );\r
PrintAndLog("-------------------------------------------------------------");\r
/*\r
TRACE - BLOCK O\r
char *retStr = buf;\r
\r
switch (id){\r
- case 1:\r
+ case DEMOD_FSK:\r
sprintf(retStr,"FSK (%d)",id);\r
break;\r
- case 2: \r
+ case DEMOD_ASK: \r
sprintf(retStr,"ASK (%d)",id);\r
break;\r
- case 3:\r
+ case DEMOD_NZR:\r
sprintf(retStr,"DIRECT/NRZ (%d)",id);\r
break;\r
- case 4:\r
+ case DEMOD_PSK:\r
sprintf(retStr,"PSK (%d)",id);\r
break;\r
- case 5:\r
+ case DEMOD_BI:\r
sprintf(retStr,"BIPHASE (%d)",id);\r
break;\r
default:\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