]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdlft55xx.c
ADD: cmdlf autocorrelations, also gives a hint to how many bytes the possible correl...
[proxmark3-svn] / client / cmdlft55xx.c
index 44c511fb32871202d979d92bec1dac68f1719d4e..61758bde01e576c632dafcce0fe9c23f3af8e9a6 100644 (file)
 #include "data.h"\r
 #include "lfdemod.h"\r
 #include "../common/crc.h"\r
+#include "../common/iso14443crc.h"\r
+#include "cmdhf14a.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
+#define CONFIGURATION_BLOCK 0x00\r
+#define TRACE_BLOCK 0x01\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, .inverted = FALSE, .offset = 0x00, .block0 = 0x00};\r
 \r
 int usage_t55xx_config(){\r
-       PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1]");\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("Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>]");\r
+       PrintAndLog("Options:");\r
+       PrintAndLog("       h                                  This help");\r
+       PrintAndLog("       d <FSK|ASK|PSK1|PSK2|PSK3|NRZ|BI>  Set demodulation");\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 position 3 to decode data");\r
        PrintAndLog("");\r
        return 0;\r
 }\r
@@ -96,7 +100,8 @@ int usage_t55xx_dump(){
        return 0;\r
 }\r
 int usage_t55xx_detect(){\r
-       PrintAndLog("Usage:  lf t55xx detect");\r
+       PrintAndLog("Usage:  lf t55xx detect [1]");\r
+       PrintAndLog("     [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");\r
        PrintAndLog("");\r
        PrintAndLog("Examples:");\r
        PrintAndLog("      lf t55xx detect");\r
@@ -107,51 +112,62 @@ int usage_t55xx_detect(){
 \r
 static int CmdHelp(const char *Cmd);\r
 \r
-int CmdT55xxSetConfig(const char *Cmd){\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 modulation[5] = {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
+                       param_getstr(Cmd, cmdp+1, modulation);\r
+                       cmdp += 2;\r
+                       \r
                        if ( strcmp(modulation, "FSK" ) == 0)\r
-                               foundModulation = 1;\r
+                               config.modulation = DEMOD_FSK;\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
+                               config.modulation = DEMOD_ASK;\r
+                       else if ( strcmp(modulation, "NRZ" ) == 0)\r
+                               config.modulation = DEMOD_NRZ;\r
+                       else if ( strcmp(modulation, "PSK1" ) == 0)\r
+                               config.modulation = DEMOD_PSK1;\r
+                       else if ( strcmp(modulation, "PSK2" ) == 0)\r
+                               config.modulation = DEMOD_PSK2;\r
+                       else if ( strcmp(modulation, "PSK3" ) == 0)\r
+                               config.modulation = DEMOD_PSK3;                 \r
                        else if ( strcmp(modulation, "BI" ) == 0)\r
-                               foundModulation = 5;\r
+                               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.inverted = 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
+\r
        // No args\r
        if (cmdp == 0) {\r
                printConfiguration( config );\r
@@ -160,15 +176,13 @@ int CmdT55xxSetConfig(const char *Cmd){
        //Validations\r
        if (errors)\r
                return usage_t55xx_config();\r
\r
-       config.modulation = foundModulation;\r
-       config.inversed = inverse;\r
+       \r
        config.block0 = 0;\r
+       printConfiguration( config );\r
        return 0;\r
 }\r
 \r
-int CmdT55xxReadBlock(const char *Cmd)\r
-{\r
+int CmdT55xxReadBlock(const char *Cmd) {\r
        int block = -1;\r
        int password = 0xFFFFFFFF; //default to blank Block 7\r
 \r
@@ -214,32 +228,41 @@ int CmdT55xxReadBlock(const char *Cmd)
 \r
 void DecodeT55xxBlock(){\r
        \r
-       char buf[6] = {0x00};\r
+       char buf[8] = {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
-                       sprintf(cmdStr,"0 %d", config.inversed );\r
+               case DEMOD_FSK:\r
+                       sprintf(cmdStr,"0 %d", config.inverted );\r
                        FSKrawDemod(cmdStr, FALSE);\r
                        break;\r
-               case 2:\r
-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
+               case DEMOD_ASK:\r
+                       sprintf(cmdStr,"0 %d 1", config.inverted );\r
                        ASKmanDemod(cmdStr, FALSE, FALSE);\r
                        break;\r
-               case 3:\r
-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
+               case DEMOD_PSK1:\r
+                       sprintf(cmdStr,"0 %d 1", config.inverted );\r
                        PSKDemod(cmdStr, FALSE);\r
                        break;\r
-               case 4:\r
-                       sprintf(cmdStr,"0 %d 1", config.inversed );\r
+               case DEMOD_PSK2:\r
+                       sprintf(cmdStr,"0 %d 1", config.inverted );\r
+                       PSKDemod(cmdStr, FALSE);\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       break;\r
+               case DEMOD_PSK3:\r
+                       sprintf(cmdStr,"0 %d 1", config.inverted );\r
+                       PSKDemod(cmdStr, FALSE);\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       break;\r
+               case DEMOD_NRZ:\r
+                       sprintf(cmdStr,"0 %d 1", config.inverted );\r
                        NRZrawDemod(cmdStr, FALSE);\r
                        break;\r
-               case 5:\r
-                       //BiphaseRawDecode("0",FALSE);\r
+               case DEMOD_BI:\r
+                       sprintf(cmdStr,"0 0 %d 1", config.inverted );\r
+                       ASKbiphaseDemod(cmdStr, FALSE);\r
                        break;\r
                default:\r
                return;\r
@@ -247,103 +270,146 @@ void DecodeT55xxBlock(){
 }\r
 \r
 int CmdT55xxDetect(const char *Cmd){\r
+\r
        char cmdp = param_getchar(Cmd, 0);\r
-       if (cmdp == 'h' || cmdp == 'H')\r
-               return usage_t55xx_detect();\r
        \r
-       // read block 0, Page 0. Configuration.\r
-       UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, 0, 0}};\r
-       c.d.asBytes[0] = 0x0; \r
-\r
-       //Password mode\r
-       // if ( res == 2 ) {\r
-               // c.arg[2] = password;\r
-               // c.d.asBytes[0] = 0x1; \r
-       // }\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') \r
+               return usage_t55xx_detect();\r
 \r
-       SendCommand(&c);\r
-       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
-               PrintAndLog("command execution time out");\r
-               return FALSE;\r
-       }\r
+       if (strlen(Cmd)==0)\r
+               AquireData( CONFIGURATION_BLOCK );\r
        \r
-       uint8_t got[12000];\r
-       GetFromBigBuf(got,sizeof(got),0);\r
-       WaitForResponse(CMD_ACK,NULL);\r
-       setGraphBuf(got, 12000);\r
-       \r
-       if ( !tryDetectModulation() ){\r
+       if ( !tryDetectModulation() )\r
                PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");\r
-       }\r
+\r
        return 0;\r
 }\r
 \r
-// detect configuration?\r
 bool tryDetectModulation(){\r
        \r
        uint8_t hits = 0;\r
-       t55xx_conf_block_t tests[10];\r
+       t55xx_conf_block_t tests[15];\r
        \r
        if (GetFskClock("", FALSE, FALSE)){ \r
-               if ( FSKrawDemod("0 0", FALSE) && test()){\r
+               if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){\r
                        tests[hits].modulation = DEMOD_FSK;\r
-                       tests[hits].inversed = FALSE;\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                     \r
                        ++hits;\r
                }\r
-               if ( FSKrawDemod("0 1", FALSE) && test()) {\r
+               if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) {\r
                        tests[hits].modulation = DEMOD_FSK;\r
-                       tests[hits].inversed = TRUE;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                     \r
                        ++hits;\r
                        }\r
     } else {\r
-               if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) {\r
+               if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {\r
                        tests[hits].modulation = DEMOD_ASK;\r
-                       tests[hits].inversed = FALSE;\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                     \r
                        ++hits;\r
                        }\r
 \r
-               if ( ASKmanDemod("0 1 1", FALSE, FALSE)  && test()) {\r
+               if ( ASKmanDemod("0 1 1", FALSE, FALSE)  && test(DEMOD_ASK, &tests[hits].offset)) {\r
                        tests[hits].modulation = DEMOD_ASK;\r
-                       tests[hits].inversed = TRUE;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\r
                        }\r
                \r
-               if ( NRZrawDemod("0 0 1", FALSE)  && test()) {\r
-                       tests[hits].modulation = DEMOD_NZR;\r
-                       tests[hits].inversed = FALSE;\r
+               if ( NRZrawDemod("0 0 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset)) {\r
+                       tests[hits].modulation = DEMOD_NRZ;\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\r
                }\r
 \r
-               if ( NRZrawDemod("0 1 1", FALSE)  && test()) {\r
-                       tests[hits].modulation = DEMOD_NZR;\r
-                       tests[hits].inversed = TRUE;\r
+               if ( NRZrawDemod("0 1 1", FALSE)  && test(DEMOD_NRZ, &tests[hits].offset)) {\r
+                       tests[hits].modulation = DEMOD_NRZ;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\r
                        }\r
                \r
-               if ( PSKDemod("0 0 1", FALSE)  && test()) {\r
-                       tests[hits].modulation = DEMOD_PSK;\r
-                       tests[hits].inversed = FALSE;\r
+               if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
+                       tests[hits].modulation = DEMOD_PSK1;\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                     \r
                        ++hits;\r
                }\r
                \r
-               if ( PSKDemod("0 1 1", FALSE) && test()) {\r
-                       tests[++hits].modulation = DEMOD_PSK;\r
-                       tests[hits].inversed = TRUE;\r
+               if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
+                       tests[hits].modulation = DEMOD_PSK1;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                     \r
+                       ++hits;\r
+               }\r
+\r
+               // PSK2 - needs a call to psk1TOpsk2.\r
+               if ( PSKDemod("0 0 1", FALSE)) {\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       if (test(DEMOD_PSK2, &tests[hits].offset)){\r
+                               tests[hits].modulation = DEMOD_PSK2;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                             \r
+                               ++hits;\r
+                       }\r
+               }\r
+               // PSK2 - needs a call to psk1TOpsk2.\r
+               if ( PSKDemod("0 1 1", FALSE)) {\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       if (test(DEMOD_PSK2, &tests[hits].offset)){\r
+                               tests[hits].modulation = DEMOD_PSK2;\r
+                               tests[hits].inverted = TRUE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                             \r
+                               ++hits;\r
+                       }\r
+               }\r
+\r
+               // PSK3 - needs a call to psk1TOpsk2.\r
+               if ( PSKDemod("0 0 1", FALSE)) {\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       if (test(DEMOD_PSK3, &tests[hits].offset)){\r
+                               tests[hits].modulation = DEMOD_PSK3;\r
+                               tests[hits].inverted = FALSE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);                             \r
+                               ++hits;\r
+                       }\r
+               }\r
+               // PSK3 - needs a call to psk1TOpsk2.\r
+               if ( PSKDemod("0 1 1", FALSE)) {\r
+                       psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+                       if (test(DEMOD_PSK3, &tests[hits].offset)){\r
+                               tests[hits].modulation = DEMOD_PSK3;\r
+                               tests[hits].inverted = TRUE;\r
+                               tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                               ++hits;\r
+                       }\r
+               }\r
+               \r
+               if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {\r
+                       tests[hits].modulation = DEMOD_BI;\r
+                       tests[hits].inverted = FALSE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+                       ++hits;\r
+               }\r
+               if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {\r
+                       tests[hits].modulation = DEMOD_BI;\r
+                       tests[hits].inverted = TRUE;\r
+                       tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
                        ++hits;\r
                }\r
-               //PSK2?\r
-               // if (!BiphaseRawDecode("0",FALSE)  && test()) {\r
-               //      tests[++hits].modulation = DEMOD_BI;\r
-               //      tests[hits].inversed = FALSE;\r
-               //}\r
-               // if (!BiphaseRawDecode("1",FALSE) && test()) {\r
-               //      tests[++hits].modulation = DEMOD_BI;\r
-               //      tests[hits].inversed = TRUE;\r
-               // }\r
        }               \r
+\r
        if ( hits == 1) {\r
                config.modulation = tests[0].modulation;\r
-               config.inversed = tests[0].inversed;\r
+               config.inverted = tests[0].inverted;\r
+               config.offset = tests[0].offset;\r
+               \r
+               DecodeT55xxBlock();\r
+               if (DemodBufferLen > config.offset + 32) \r
+                       config.block0 = PackBits(config.offset, 32, DemodBuffer);\r
                printConfiguration( config );\r
                return TRUE;\r
        }\r
@@ -351,55 +417,131 @@ bool tryDetectModulation(){
        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
        return FALSE;\r
 }\r
 \r
-bool test(){\r
+bool testModulation(uint8_t mode, uint8_t modread){\r
+       switch( mode ){\r
+               case DEMOD_FSK:\r
+                       if (modread > 3 && modread < 8) return TRUE;\r
+                       break;\r
+               case DEMOD_ASK:\r
+                       if (modread == 8) return TRUE;\r
+                       break;\r
+               case DEMOD_PSK1:\r
+                       if (modread == 1) return TRUE;\r
+                       break;\r
+               case DEMOD_PSK2:\r
+                       if (modread == 2) return TRUE;\r
+                       break;\r
+               case DEMOD_PSK3:\r
+                       if (modread == 3) return TRUE;\r
+                       break;\r
+               case DEMOD_NRZ:\r
+                       if (!modread) return TRUE;\r
+                       break;\r
+               case DEMOD_BI:\r
+                       if (modread == 16) return TRUE;\r
+                       break;\r
+               default:\r
+                       return FALSE;\r
+       }\r
+       return FALSE;\r
+}\r
 \r
-       if ( !DemodBufferLen) \r
-               return false;\r
-       \r
-       uint8_t si = 1;\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
+bool test(uint8_t mode, uint8_t *offset){\r
 \r
-       //PrintAndLog("test: %X %X %X ", safer, resv, extend);\r
+       if ( !DemodBufferLen) return FALSE;\r
        \r
-       // 2nibble must be zeroed.\r
-       if ( resv > 0x00) return FALSE;\r
+       uint8_t si = 0;\r
+       for (uint8_t idx = 0; idx < 64; ++idx){\r
+               si = idx;\r
+               if ( PackBits(si, 32, DemodBuffer) == 0x00 ) continue;\r
+\r
+               uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;           //master key\r
+               uint8_t resv     = PackBits(si, 4, DemodBuffer); si += 4;     //was 7 & +=7+3 //should be only 4 bits if extended mode\r
 \r
-       if ( safer == 0x6 || safer == 0x9){\r
-               if ( extend == 0x00)\r
-                       return TRUE;\r
+               // 2nibble must be zeroed.\r
+               // moved test to here, since this gets most faults first.\r
+               if ( resv > 0x00) continue;\r
+\r
+               uint8_t xtRate   = PackBits(si, 3, DemodBuffer); si += 3+3;   //new\r
+               //uint8_t bitRate  = PackBits(si, 3, DemodBuffer); si += 3;   //new  could check bit rate\r
+               uint8_t extend   = PackBits(si, 1, DemodBuffer); si += 1;     //bit 15 extended mode\r
+               uint8_t modread  = PackBits(si, 5, DemodBuffer); si += 5+2+1; //new\r
+               //uint8_t pskcr   = PackBits(si, 2, DemodBuffer); si += 2+1;  //new  could check psk cr\r
+               uint8_t nml01    = PackBits(si, 1, DemodBuffer); si += 1+5;   //bit 24 , 30, 31 could be tested for 0 if not extended mode\r
+               uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;\r
+               \r
+               //if extended mode\r
+               bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? TRUE : FALSE;\r
+\r
+               if (!extMode){\r
+                       if (nml01 || nml02 || xtRate) continue;\r
+               }\r
+\r
+               //test modulation\r
+               if (!testModulation(mode, modread)) continue;\r
+               \r
+               *offset = idx;\r
+               return TRUE;\r
        }\r
-       if ( resv== 0x00) return TRUE;\r
        return FALSE;\r
 }\r
 \r
 void printT55xxBlock(const char *demodStr){\r
-       \r
+\r
+       uint8_t i = config.offset;\r
+       uint8_t endpos = 32 + i;        \r
        uint32_t blockData = 0;\r
-       uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
-               \r
-       if ( !DemodBufferLen) \r
+       uint8_t bits[64] = {0x00};\r
+\r
+       if ( !DemodBufferLen) return;\r
+       \r
+       if ( endpos > DemodBufferLen){\r
+               PrintAndLog("The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32);\r
                return;\r
+       }\r
+\r
+    for (; i < endpos; ++i)\r
+               bits[i - config.offset] = DemodBuffer[i];\r
        \r
-       int i =0;\r
-    for (;i<DemodBufferLen;++i)\r
-               bits[i]=DemodBuffer[i];\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 < 64; ++j){\r
+               \r
+               for (i = 0; i < 32; ++i)\r
+                       bits[i]=DemodBuffer[j+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
+\r
+               //char indicate[4] = {0x00};\r
+               // if ( (blockData >> 24) == 0xE0 )\r
+                       // sprintf(indicate,"<--");\r
+               //PrintAndLog("[%02d] 0x%08X  %s %s",j , blockData, sprint_bin(bits,32), indicate);     \r
+               PrintAndLog("[%02d] 0x%08X  %s",j , blockData, sprint_bin(bits,32));    \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("Block0     : %08X", b.block0);\r
+       PrintAndLog("Inverted   : %s", (b.inverted) ? "Yes" : "No" );\r
+       PrintAndLog("Offset     : %d", b.offset);\r
+       PrintAndLog("Block0     : 0x%08X", b.block0);\r
        PrintAndLog("");\r
 }\r
 \r
@@ -423,16 +565,14 @@ int CmdT55xxWriteBlock(const char *Cmd)
        }\r
 \r
        if (block > 7) {\r
-               PrintAndLog("Block must be between 0 and 7");\r
+               PrintAndLog("Block number must be between 0 and 7");\r
                return 1;\r
        }\r
        \r
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
        c.d.asBytes[0] = 0x0; \r
 \r
-       PrintAndLog("Writing to T55x7");\r
-       PrintAndLog("block : %d", block);\r
-       PrintAndLog("data  : 0x%08X", data);\r
+       PrintAndLog("Writing to block: %d  data: 0x%08X", block, data);\r
 \r
        //Password mode\r
        if (res == 3) {\r
@@ -451,29 +591,18 @@ int CmdT55xxReadTrace(const char *Cmd)
        if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') \r
                return usage_t55xx_trace();\r
 \r
-       if ( strlen(Cmd)==0){\r
-       \r
-               UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
-               SendCommand(&c);\r
-               if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
-                       PrintAndLog("command execution time out");\r
-                       return 1;\r
-               }\r
-\r
-               uint8_t got[12000];\r
-               GetFromBigBuf(got,sizeof(got),0);\r
-               WaitForResponse(CMD_ACK,NULL);\r
-               setGraphBuf(got, 12000);\r
-       }\r
+       if (strlen(Cmd)==0)\r
+               AquireData( TRACE_BLOCK );\r
        \r
        DecodeT55xxBlock();\r
 \r
-       if ( !DemodBufferLen) \r
-               return 2;\r
+       if (!DemodBufferLen) return 1;\r
        \r
        RepaintGraphWindow();\r
-\r
-       uint8_t si = 5;\r
+       uint8_t repeat = 0;\r
+       if (config.offset > 5) \r
+               repeat = 32;\r
+       uint8_t si = config.offset+repeat;\r
        uint32_t bl0     = PackBits(si, 32, DemodBuffer);\r
        uint32_t bl1     = PackBits(si+32, 32, DemodBuffer);\r
        \r
@@ -493,8 +622,8 @@ int CmdT55xxReadTrace(const char *Cmd)
        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(" MFC Manufacturer ID (ISO/IEC 7816-6)    : 0x%02X (%d) - %s", mfc, mfc, getTagInfo(mfc));\r
+       PrintAndLog(" CID                                     : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));\r
        PrintAndLog(" ICR IC Revision                         : %d",icr );\r
        PrintAndLog(" Manufactured");\r
        PrintAndLog("     Year/Quarter : %d/%d",year, quarter );\r
@@ -503,9 +632,12 @@ int CmdT55xxReadTrace(const char *Cmd)
        PrintAndLog("     Die Number   : %d", dw);\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Raw Data - Page 1");\r
-       PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+5,32) );\r
-       PrintAndLog("     Block 1  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+37,32) );\r
+       PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+config.offset+repeat,32) );\r
+       PrintAndLog("     Block 1  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );\r
        PrintAndLog("-------------------------------------------------------------");\r
+       \r
+       if ( acl != 0xE0 ) \r
+               PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");\r
        /*\r
        TRACE - BLOCK O\r
                Bits    Definition                                                              HEX\r
@@ -534,40 +666,17 @@ int CmdT55xxInfo(const char *Cmd){
        */\r
        char cmdp = param_getchar(Cmd, 0);\r
 \r
-       if (cmdp == 'h' || cmdp == 'H')\r
+       if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') \r
                return usage_t55xx_info();\r
        \r
-       if (strlen(Cmd)==0){\r
-               \r
-               // read block 0, Page 0. Configuration.\r
-               UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, 0, 0}};\r
-               c.d.asBytes[0] = 0x0; \r
-\r
-               //Password mode\r
-               // if ( res == 2 ) {\r
-                       // c.arg[2] = password;\r
-                       // c.d.asBytes[0] = 0x1; \r
-               // }\r
-\r
-               SendCommand(&c);\r
-               if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
-                       PrintAndLog("command execution time out");\r
-                       return 1;\r
-               }\r
-\r
-               uint8_t got[12000];\r
-               GetFromBigBuf(got,sizeof(got),0);\r
-               WaitForResponse(CMD_ACK,NULL);\r
-               setGraphBuf(got, 12000);\r
-       }\r
+       if (strlen(Cmd)==0)\r
+               AquireData( CONFIGURATION_BLOCK );\r
        \r
        DecodeT55xxBlock();\r
 \r
-       if ( !DemodBufferLen) \r
-               return 2;\r
+       if (!DemodBufferLen) return 1;\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
@@ -593,7 +702,7 @@ int CmdT55xxInfo(const char *Cmd){
        PrintAndLog(" Data bit rate             : %s", GetBitRateStr(dbr));\r
        PrintAndLog(" eXtended mode             : %s", (extend) ? "Yes - Warning":"No");\r
        PrintAndLog(" Modulation                : %s", GetModulationStr(datamod));\r
-       PrintAndLog(" PSK clock freq            : %d", pskcf);\r
+       PrintAndLog(" PSK clock frequency       : %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
@@ -604,9 +713,8 @@ int CmdT55xxInfo(const char *Cmd){
        PrintAndLog(" POR-Delay                 : %s", (por) ? "Yes":"No");\r
        PrintAndLog("-------------------------------------------------------------");\r
        PrintAndLog(" Raw Data - Page 0");\r
-       PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+5,32) );\r
+       PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+config.offset,32) );\r
        PrintAndLog("-------------------------------------------------------------");\r
-       \r
        return 0;\r
 }\r
 \r
@@ -641,6 +749,39 @@ int CmdT55xxDump(const char *Cmd){
        return 0;\r
 }\r
 \r
+int AquireData( uint8_t block ){\r
+\r
+       UsbCommand c;\r
+       \r
+       if ( block == CONFIGURATION_BLOCK ) \r
+               c.cmd = CMD_T55XX_READ_BLOCK;\r
+       else if (block == TRACE_BLOCK )\r
+               c.cmd = CMD_T55XX_READ_TRACE;\r
+               \r
+       c.arg[0] = 0x00;\r
+       c.arg[1] = 0x00;\r
+       c.arg[2] = 0x00;\r
+       c.d.asBytes[0] = 0x0; \r
+\r
+       //Password mode\r
+       // if ( res == 2 ) {\r
+               // c.arg[2] = password;\r
+               // c.d.asBytes[0] = 0x1; \r
+       // }\r
+\r
+       SendCommand(&c);\r
+       if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+               PrintAndLog("command execution time out");\r
+               return 1;\r
+       }\r
+\r
+       uint8_t got[12000];\r
+       GetFromBigBuf(got,sizeof(got),0);\r
+       WaitForResponse(CMD_ACK,NULL);\r
+       setGraphBuf(got, 12000);\r
+       return 0;\r
+}\r
+\r
 char * GetBitRateStr(uint32_t id){\r
        static char buf[40];\r
        char *retStr = buf;\r
@@ -736,6 +877,16 @@ char * GetModulationStr( uint32_t id){
        return buf;\r
 }\r
 \r
+char * GetModelStrFromCID(uint32_t cid){\r
+               \r
+       static char buf[10];\r
+       char *retStr = buf;\r
+       \r
+       if (cid == 1) sprintf(retStr,"ATA5577M1");\r
+       if (cid == 2) sprintf(retStr,"ATA5577M2");      \r
+       return buf;\r
+}\r
+\r
 char * GetSelectedModulationStr( uint8_t id){\r
 \r
        static char buf[16];\r
@@ -743,19 +894,25 @@ char * GetSelectedModulationStr( uint8_t id){
        \r
        switch (id){\r
                case DEMOD_FSK:\r
-                       sprintf(retStr,"FSK (%d)",id);\r
+                       sprintf(retStr,"FSK");\r
                        break;\r
                case DEMOD_ASK:         \r
-                       sprintf(retStr,"ASK (%d)",id);\r
+                       sprintf(retStr,"ASK");\r
+                       break;\r
+               case DEMOD_NRZ:\r
+                       sprintf(retStr,"DIRECT/NRZ");\r
                        break;\r
-               case DEMOD_NZR:\r
-                       sprintf(retStr,"DIRECT/NRZ (%d)",id);\r
+               case DEMOD_PSK1:\r
+                       sprintf(retStr,"PSK1");\r
                        break;\r
-               case DEMOD_PSK:\r
-                       sprintf(retStr,"PSK (%d)",id);\r
+               case DEMOD_PSK2:\r
+                       sprintf(retStr,"PSK2");\r
                        break;\r
+               case DEMOD_PSK3:\r
+                       sprintf(retStr,"PSK3");\r
+                       break;                  \r
                case DEMOD_BI:\r
-                       sprintf(retStr,"BIPHASE (%d)",id);\r
+                       sprintf(retStr,"BIPHASE");\r
                        break;\r
                default:\r
                        sprintf(retStr,"(Unknown)");\r
@@ -768,26 +925,27 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
        \r
        int i = start;\r
        int j = len-1;\r
-       if (len > 32) {\r
-               return 0;\r
-       }\r
+\r
+       if (len > 32) return 0;\r
+\r
        uint32_t tmp = 0;\r
-       for (; j >= 0; --j, ++i){\r
+       for (; j >= 0; --j, ++i)\r
                tmp     |= bits[i] << j;\r
-       }\r
+       \r
        return tmp;\r
 }\r
 \r
 static command_t CommandTable[] =\r
 {\r
   {"help",   CmdHelp,           1, "This help"},\r
-  {"config", CmdT55xxSetConfig, 1, "Set T55XX config for modulation, inversed data"},\r
-  {"detect", CmdT55xxDetect,    0, "Try detecting the tag modulation from reading the configuration block."},\r
+  {"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset)"},\r
+  {"detect", CmdT55xxDetect,    0, "[1] Try detecting the tag modulation from reading the configuration block."},\r
   {"read",   CmdT55xxReadBlock, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
   {"write",  CmdT55xxWriteBlock,0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\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, "Show block changes with 64 different offsets"},\r
   {NULL, NULL, 0, NULL}\r
 };\r
 \r
Impressum, Datenschutz