X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/7b40affb6f7087e116bccff352923834dcdc8d46..ba765c9edcdbc624c9e77673acf5fa60daec9deb:/client/cmdlft55xx.c?ds=sidebyside
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index b303aced..da3ee1a9 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -22,33 +22,28 @@
#include "data.h"
#include "lfdemod.h"
#include "../common/crc.h"
+#include "../common/iso14443crc.h"
+#include "cmdhf14a.h"
-#define LF_TRACE_BUFF_SIZE 20000 // 32 x 32 x 10 (32 bit times numofblock (7), times clock skip..)
-#define LF_BITSSTREAM_LEN 1000 // more then 1000 bits shouldn't happend.. 8block * 4 bytes * 8bits =
+#define CONFIGURATION_BLOCK 0x00
+#define TRACE_BLOCK 0x01
-// 0 = FSK
-// 1 = ASK
-// 2 = PSK
-// 4 = NZR (direct)
-typedef struct {
- uint8_t modulation;
- bool inversed;
- uint32_t block0;
-} t55xx_conf_block_t;
-
-// Default configuration: FSK, not inversed.
-t55xx_conf_block_t config = { .modulation = 2, .inversed = FALSE, .block0 = 0x00};
+// Default configuration
+t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = FALSE, .offset = 0x00, .block0 = 0x00};
int usage_t55xx_config(){
- PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1]");
+ PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>]");
PrintAndLog("Options: ");
PrintAndLog(" h This help");
- PrintAndLog(" d <FSK|ASK|PSK|NZ|BI> Set demodulation FSK / ASK / PSK / NZ / Biphase");
- PrintAndLog(" i [1] Inverse data signal, defaults to normal");
+ PrintAndLog(" b <8|16|32|40|50|64|100|128> Set bitrate");
+ PrintAndLog(" d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NZ|BI|BIa> Set demodulation FSK / ASK / PSK / NZ / Biphase / Biphase A");
+ PrintAndLog(" i [1] Invert data signal, defaults to normal");
+ PrintAndLog(" o [offset] Set offset, where data should start decode in bitstream");
PrintAndLog("");
PrintAndLog("Examples:");
- PrintAndLog(" lf t55xx config d FSK - FSK demodulation");
- PrintAndLog(" lf t55xx config d FSK i 1 - FSK demodulation, inverse data");
+ PrintAndLog(" lf t55xx config d FSK - FSK demodulation");
+ PrintAndLog(" lf t55xx config d FSK i 1 - FSK demodulation, inverse data");
+ PrintAndLog(" lf t55xx config d FSK i 1 o 3 - FSK demodulation, inverse data, offset=3,start from position 3 to decode data");
PrintAndLog("");
return 0;
}
@@ -117,42 +112,78 @@ int usage_t55xx_detect(){
static int CmdHelp(const char *Cmd);
-int CmdT55xxSetConfig(const char *Cmd){
+int CmdT55xxSetConfig(const char *Cmd) {
- int len;
- bool inverse;
+ uint8_t offset = 0;
bool errors = FALSE;
uint8_t cmdp = 0;
- char modulation[4] = {0x00};
-
+ char modulation[5] = {0x00};
+ char tmp = 0x00;
+ uint8_t bitRate = 0;
+ uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};
while(param_getchar(Cmd, cmdp) != 0x00 && !errors)
{
- switch(param_getchar(Cmd, cmdp))
+ tmp = param_getchar(Cmd, cmdp);
+ switch(tmp)
{
case 'h':
case 'H':
return usage_t55xx_config();
+ case 'b':
+ errors |= param_getdec(Cmd, cmdp+1, &bitRate);
+ if ( !errors){
+ uint8_t i = 0;
+ for (; i < 9; i++){
+ if (rates[i]==bitRate) {
+ config.bitrate = i;
+ break;
+ }
+ }
+ if (i==9) errors = TRUE;
+ }
+ cmdp+=2;
+ break;
case 'd':
- len = param_getstr(Cmd, cmdp+1, modulation);
- cmdp+= len+1;
- //FSK|ASK|PSK|NZ|BI
+ param_getstr(Cmd, cmdp+1, modulation);
+ cmdp += 2;
+
if ( strcmp(modulation, "FSK" ) == 0)
- len = 1;
+ config.modulation = DEMOD_FSK;
+ else if ( strcmp(modulation, "FSK1" ) == 0)
+ config.modulation = DEMOD_FSK1;
+ else if ( strcmp(modulation, "FSK1a" ) == 0)
+ config.modulation = DEMOD_FSK1a;
+ else if ( strcmp(modulation, "FSK2" ) == 0)
+ config.modulation = DEMOD_FSK2;
+ else if ( strcmp(modulation, "FSK2a" ) == 0)
+ config.modulation = DEMOD_FSK2a;
else if ( strcmp(modulation, "ASK" ) == 0)
- len = 2;
- else if ( strcmp(modulation, "PSK" ) == 0)
- len = 3;
- else if ( strcmp(modulation, "NZ" ) == 0)
- len = 4;
+ config.modulation = DEMOD_ASK;
+ else if ( strcmp(modulation, "NRZ" ) == 0)
+ config.modulation = DEMOD_NRZ;
+ else if ( strcmp(modulation, "PSK1" ) == 0)
+ config.modulation = DEMOD_PSK1;
+ else if ( strcmp(modulation, "PSK2" ) == 0)
+ config.modulation = DEMOD_PSK2;
+ else if ( strcmp(modulation, "PSK3" ) == 0)
+ config.modulation = DEMOD_PSK3;
+ else if ( strcmp(modulation, "BIa" ) == 0)
+ config.modulation = DEMOD_BIa;
else if ( strcmp(modulation, "BI" ) == 0)
- len = 5;
+ config.modulation = DEMOD_BI;
else {
PrintAndLog("Unknown modulation '%s'", modulation);
errors = TRUE;
}
break;
case 'i':
- inverse = param_getchar(Cmd,cmdp+1) == '1';
+ config.inverted = param_getchar(Cmd,cmdp+1) == '1';
+ cmdp+=2;
+ break;
+ case 'o':
+ errors |= param_getdec(Cmd, cmdp+1, &offset);
+ if ( !errors )
+ config.offset = offset;
cmdp+=2;
break;
default:
@@ -161,25 +192,22 @@ int CmdT55xxSetConfig(const char *Cmd){
break;
}
}
+
// No args
if (cmdp == 0) {
- PrintAndLog("Modulation: %d", config.modulation);
- PrintAndLog("Invert : %d", config.inversed);
- PrintAndLog("Block0 : %08X", config.block0);
+ printConfiguration( config );
return 0;
}
//Validations
if (errors)
return usage_t55xx_config();
-
- config.modulation = len;
- config.inversed = inverse;
- config.block0 = 0;
+
+ config.block0 = 0;
+ printConfiguration ( config );
return 0;
}
-int CmdT55xxReadBlock(const char *Cmd)
-{
+int CmdT55xxReadBlock(const char *Cmd) {
int block = -1;
int password = 0xFFFFFFFF; //default to blank Block 7
@@ -217,208 +245,446 @@ int CmdT55xxReadBlock(const char *Cmd)
GetFromBigBuf(got,sizeof(got),0);
WaitForResponse(CMD_ACK,NULL);
setGraphBuf(got, 12000);
-
- DecodeT55xxBlock();
- printT55xxBlock("");
+ DemodBufferLen=0;
+ if (!DecodeT55xxBlock()) return 3;
+ char blk[10]={0};
+ sprintf(blk,"%d", block);
+ printT55xxBlock(blk);
return 0;
}
-void DecodeT55xxBlock(){
+bool DecodeT55xxBlock(){
- char buf[6] = {0x00};
+ char buf[8] = {0x00};
char *cmdStr = buf;
+ int ans = 0;
+ uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};
+
+ DemodBufferLen = 0x00;
- // use the configuration
switch( config.modulation ){
- case 1:
- sprintf(cmdStr,"0 %d", config.inversed );
- FSKrawDemod(cmdStr, FALSE);
+ case DEMOD_FSK:
+ //CmdLtrim("26");
+ sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );
+ CmdLtrim(cmdStr);
+ sprintf(cmdStr,"%d %d", bitRate[config.bitrate], config.inverted );
+ ans = FSKrawDemod(cmdStr, FALSE);
break;
- case 2:
- sprintf(cmdStr,"0 %d 1", config.inversed );
- ASKmanDemod(cmdStr, FALSE, FALSE);
- PrintAndLog("ice");
+ case DEMOD_FSK1:
+ //CmdLtrim("26");
+ sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );
+ CmdLtrim(cmdStr);
+ sprintf(cmdStr,"%d 1 8 5", bitRate[config.bitrate] );
+ ans = FSKrawDemod(cmdStr, FALSE);
break;
- case 3:
- sprintf(cmdStr,"0 %d 1", config.inversed );
- PSKDemod(cmdStr, FALSE);
+ case DEMOD_FSK1a:
+ //CmdLtrim("26");
+ sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );
+ CmdLtrim(cmdStr);
+ sprintf(cmdStr,"%d 0 8 5", bitRate[config.bitrate] );
+ ans = FSKrawDemod(cmdStr, FALSE);
break;
- case 4:
- sprintf(cmdStr,"0 %d 1", config.inversed );
- NRZrawDemod(cmdStr, FALSE);
+ case DEMOD_FSK2:
+ //CmdLtrim("26");
+ sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );
+ CmdLtrim(cmdStr);
+ sprintf(cmdStr,"%d 0 10 8", bitRate[config.bitrate] );
+ ans = FSKrawDemod(cmdStr, FALSE);
break;
- case 5:
- //BiphaseRawDecode("0",FALSE);
+ case DEMOD_FSK2a:
+ //CmdLtrim("26");
+ sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );
+ CmdLtrim(cmdStr);
+ sprintf(cmdStr,"%d 1 10 8", bitRate[config.bitrate] );
+ ans = FSKrawDemod(cmdStr, FALSE);
+ break;
+ case DEMOD_ASK:
+ sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );
+ ans = ASKmanDemod(cmdStr, FALSE, FALSE);
+ break;
+ case DEMOD_PSK1:
+ sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );
+ ans = PSKDemod(cmdStr, FALSE);
+ break;
+ case DEMOD_PSK2:
+ sprintf(cmdStr,"%d 1", bitRate[config.bitrate] );
+ ans = PSKDemod(cmdStr, FALSE);
+ psk1TOpsk2(DemodBuffer, DemodBufferLen);
+ break;
+ case DEMOD_PSK3:
+ sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );
+ ans = PSKDemod(cmdStr, FALSE);
+ psk1TOpsk2(DemodBuffer, DemodBufferLen);
+ break;
+ case DEMOD_NRZ:
+ sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );
+ ans = NRZrawDemod(cmdStr, FALSE);
+ break;
+ case DEMOD_BI:
+ sprintf(cmdStr,"0 %d 0 1", bitRate[config.bitrate] );
+ ans = ASKbiphaseDemod(cmdStr, FALSE);
+ break;
+ case DEMOD_BIa:
+ sprintf(cmdStr,"0 %d 1 1", bitRate[config.bitrate] );
+ ans = ASKbiphaseDemod(cmdStr, FALSE);
break;
default:
- return;
+ return FALSE;
}
+ return (bool) ans;
}
int CmdT55xxDetect(const char *Cmd){
+
char cmdp = param_getchar(Cmd, 0);
- if (cmdp == 'h' || cmdp == 'H')
+ if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H')
return usage_t55xx_detect();
- // read block 0, Page 0. Configuration.
- UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, 0, 0}};
- c.d.asBytes[0] = 0x0;
+ if (strlen(Cmd)==0)
+ AquireData( CONFIGURATION_BLOCK );
- //Password mode
- // if ( res == 2 ) {
- // c.arg[2] = password;
- // c.d.asBytes[0] = 0x1;
- // }
-
- SendCommand(&c);
- if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
- PrintAndLog("command execution time out");
- return FALSE;
- }
-
- uint8_t got[12000];
- GetFromBigBuf(got,sizeof(got),0);
- WaitForResponse(CMD_ACK,NULL);
- setGraphBuf(got, 12000);
-
- if ( !tryDetectModulation() ){
+ if ( !tryDetectModulation() )
PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
- }
+
return 0;
}
// detect configuration?
bool tryDetectModulation(){
-
+ char cmdStr[8] = {0};
uint8_t hits = 0;
- t55xx_conf_block_t tests[10];
+ t55xx_conf_block_t tests[15];
if (GetFskClock("", FALSE, FALSE)){
- if ( FSKrawDemod("0 0", FALSE) && test()){
- tests[hits].modulation = 1;
- tests[hits].inversed = 0;
+ uint8_t fc1 = 0, fc2 = 0, clk=0;
+ fskClocks(&fc1, &fc2, &clk, FALSE);
+ sprintf(cmdStr,"%d", clk/2);
+ CmdLtrim(cmdStr);
+ if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){
+ tests[hits].modulation = DEMOD_FSK;
+ if (fc1==8 && fc2 == 5)
+ tests[hits].modulation = DEMOD_FSK1a;
+ else if (fc1==10 && fc2 == 8)
+ tests[hits].modulation = DEMOD_FSK2;
+
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- if ( FSKrawDemod("0 1", FALSE) && test()) {
- tests[hits].modulation = 1;
- tests[hits].inversed = 1;
+ if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) {
+ tests[hits].modulation = DEMOD_FSK;
+ if (fc1==8 && fc2 == 5)
+ tests[hits].modulation = DEMOD_FSK1;
+ else if (fc1==10 && fc2 == 8)
+ tests[hits].modulation = DEMOD_FSK2a;
+
+ tests[hits].inverted = TRUE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
- }
- } else {
- if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test()) {
- tests[hits].modulation = 2;
- tests[hits].inversed = 0;
+ }
+ } else {
+ if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {
+ tests[hits].modulation = DEMOD_ASK;
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test()) {
- tests[hits].modulation = 2;
- tests[hits].inversed = 1;
+ if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {
+ tests[hits].modulation = DEMOD_ASK;
+ tests[hits].inverted = TRUE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- if ( NRZrawDemod("0 0 1", FALSE) && test()) {
- tests[hits].modulation = 3;
- tests[hits].inversed = 0;
+ if ( NRZrawDemod("0 0 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset)) {
+ tests[hits].modulation = DEMOD_NRZ;
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- if ( NRZrawDemod("0 1 1", FALSE) && test()) {
- tests[hits].modulation = 3;
- tests[hits].inversed = 1;
+ if ( NRZrawDemod("0 1 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset)) {
+ tests[hits].modulation = DEMOD_NRZ;
+ tests[hits].inverted = TRUE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- if ( PSKDemod("0 0 1", FALSE) && test()) {
- tests[hits].modulation = 4;
- tests[hits].inversed = 0;
+ if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {
+ tests[hits].modulation = DEMOD_PSK1;
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- if ( PSKDemod("0 1 1", FALSE) && test()) {
- tests[++hits].modulation = 4;
- tests[hits].inversed = 1;
+ if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {
+ tests[hits].modulation = DEMOD_PSK1;
+ tests[hits].inverted = TRUE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ ++hits;
+ }
+
+ // PSK2 - needs a call to psk1TOpsk2.
+ if ( PSKDemod("0 0 1", FALSE)) {
+ psk1TOpsk2(DemodBuffer, DemodBufferLen);
+ if (test(DEMOD_PSK2, &tests[hits].offset)){
+ tests[hits].modulation = DEMOD_PSK2;
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ ++hits;
+ }
+ } // inverse waves does not affect this demod
+
+ // PSK3 - needs a call to psk1TOpsk2.
+ if ( PSKDemod("0 0 1", FALSE)) {
+ psk1TOpsk2(DemodBuffer, DemodBufferLen);
+ if (test(DEMOD_PSK3, &tests[hits].offset)){
+ tests[hits].modulation = DEMOD_PSK3;
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ ++hits;
+ }
+ } // inverse waves does not affect this demod
+
+ if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {
+ tests[hits].modulation = DEMOD_BI;
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ ++hits;
+ }
+ if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BIa, &tests[hits].offset) ) {
+ tests[hits].modulation = DEMOD_BIa;
+ tests[hits].inverted = TRUE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- //PSK2?
- // if (!BiphaseRawDecode("0",FALSE) && test()) {
- // tests[++hits].modulation = 5;
- // tests[hits].inversed = 0;
- //}
- // if (!BiphaseRawDecode("1",FALSE) && test()) {
- // tests[++hits].modulation = 5;
- // tests[hits].inversed = 1;
- // }
}
if ( hits == 1) {
- PrintAndLog("Modulation: %d Inverse: %d", tests[0].modulation, tests[0].inversed);
config.modulation = tests[0].modulation;
- config.inversed = tests[0].inversed;
+ config.inverted = tests[0].inverted;
+ config.offset = tests[0].offset;
+ config.block0 = tests[0].block0;
+ printConfiguration( config );
return TRUE;
}
if ( hits > 1) {
PrintAndLog("Found [%d] possible matches for modulation.",hits);
for(int i=0; i<hits; ++i){
- PrintAndLog("Modulation: %d Inverse: %d", tests[i].modulation, tests[i].inversed);
+ PrintAndLog("--[%d]---------------", i+1);
+ printConfiguration( tests[i] );
}
}
return FALSE;
}
-bool test(){
+bool testModulation(uint8_t mode, uint8_t modread){
+ switch( mode ){
+ case DEMOD_FSK:
+ if (modread > 3 && modread < 8) return TRUE;
+ break;
+ case DEMOD_ASK:
+ if (modread == DEMOD_ASK) return TRUE;
+ break;
+ case DEMOD_PSK1:
+ if (modread == DEMOD_PSK1) return TRUE;
+ break;
+ case DEMOD_PSK2:
+ if (modread == DEMOD_PSK2) return TRUE;
+ break;
+ case DEMOD_PSK3:
+ if (modread == DEMOD_PSK3) return TRUE;
+ break;
+ case DEMOD_NRZ:
+ if (modread == DEMOD_NRZ) return TRUE;
+ break;
+ case DEMOD_BI:
+ if (modread == DEMOD_BI) return TRUE;
+ break;
+ case DEMOD_BIa:
+ if (modread == DEMOD_BIa) return TRUE;
+ break;
+ default:
+ return FALSE;
+ }
+ return FALSE;
+}
- if ( !DemodBufferLen)
- return false;
-
- uint8_t si = 1;
- uint8_t safer = PackBits(si, 4, DemodBuffer); si += 4;
- uint8_t resv = PackBits(si, 7, DemodBuffer); si += 7+3;
- uint8_t extend = PackBits(si, 1, DemodBuffer); si += 1;
+bool testBitRate(uint8_t readRate, uint8_t mod){
+ uint8_t expected[8] = {8, 16, 32, 40, 50, 64, 100, 128};
+ uint8_t detRate = 0;
+ switch( mod ){
+ case DEMOD_FSK:
+ detRate = GetFskClock("",FALSE, FALSE);
+ if (expected[readRate] == detRate) {
+ config.bitrate = readRate;
+ return TRUE;
+ }
+ break;
+ case DEMOD_FSK1:
+ detRate = GetFskClock("",FALSE, FALSE);
+ if (expected[readRate] == detRate) {
+ config.bitrate = readRate;
+ return TRUE;
+ }
+ break;
+ case DEMOD_FSK1a:
+ detRate = GetFskClock("",FALSE, FALSE);
+ if (expected[readRate] == detRate) {
+ config.bitrate = readRate;
+ return TRUE;
+ }
+ break;
+ case DEMOD_FSK2:
+ detRate = GetFskClock("",FALSE, FALSE);
+ if (expected[readRate] == detRate) {
+ config.bitrate = readRate;
+ return TRUE;
+ }
+ break;
+ case DEMOD_FSK2a:
+ detRate = GetFskClock("",FALSE, FALSE);
+ if (expected[readRate] == detRate) {
+ config.bitrate = readRate;
+ return TRUE;
+ }
+ break;
+ case DEMOD_ASK:
+ detRate = GetAskClock("",FALSE, FALSE);
+ if (expected[readRate] == detRate) {
+ config.bitrate = readRate;
+ return TRUE;
+ }
+ break;
+ case DEMOD_PSK1:
+ detRate = GetPskClock("",FALSE, FALSE);
+ if (expected[readRate] == detRate) {
+ config.bitrate = readRate;
+ return TRUE;
+ }
+ break;
+ case DEMOD_PSK2:
+ detRate = GetPskClock("",FALSE, FALSE);
+ if (expected[readRate] == detRate) {
+ config.bitrate = readRate;
+ return TRUE;
+ }
+ break;
+ case DEMOD_PSK3:
+ detRate = GetPskClock("",FALSE, FALSE);
+ if (expected[readRate] == detRate) {
+ config.bitrate = readRate;
+ return TRUE;
+ }
+ break;
+ case DEMOD_NRZ:
+ detRate = GetNrzClock("",FALSE, FALSE);
+ if (expected[readRate] == detRate) {
+ config.bitrate = readRate;
+ return TRUE;
+ }
+ break;
+ case DEMOD_BI:
+ detRate = GetAskClock("",FALSE, FALSE);
+ if (expected[readRate] == detRate) {
+ config.bitrate = readRate;
+ return TRUE;
+ }
+ break;
+ default:
+ return FALSE;
+ }
+ return FALSE;
+}
- //PrintAndLog("test: %X %X %X ", safer, resv, extend);
-
- // 2nibble must be zeroed.
- if ( resv > 0x00) return FALSE;
+bool test(uint8_t mode, uint8_t *offset){
- if ( safer == 0x6 || safer == 0x9){
- if ( extend == 0x00)
- return TRUE;
+ if ( !DemodBufferLen) return FALSE;
+ uint8_t si = 0;
+ for (uint8_t idx = 0; idx < 64; idx++){
+ si = idx;
+ if ( PackBits(si, 32, DemodBuffer) == 0x00 ) continue;
+
+ uint8_t safer = PackBits(si, 4, DemodBuffer); si += 4; //master key
+ uint8_t resv = PackBits(si, 4, DemodBuffer); si += 4; //was 7 & +=7+3 //should be only 4 bits if extended mode
+ // 2nibble must be zeroed.
+ // moved test to here, since this gets most faults first.
+ if ( resv > 0x00) continue;
+
+ uint8_t xtRate = PackBits(si, 3, DemodBuffer); si += 3; //new
+ uint8_t bitRate = PackBits(si, 3, DemodBuffer); si += 3; //new could check bit rate
+ uint8_t extend = PackBits(si, 1, DemodBuffer); si += 1; //bit 15 extended mode
+ uint8_t modread = PackBits(si, 5, DemodBuffer); si += 5+2+1; //new
+ //uint8_t pskcr = PackBits(si, 2, DemodBuffer); si += 2+1; //new could check psk cr
+ uint8_t nml01 = PackBits(si, 1, DemodBuffer); si += 1+5; //bit 24 , 30, 31 could be tested for 0 if not extended mode
+ uint8_t nml02 = PackBits(si, 2, DemodBuffer); si += 2;
+
+ //if extended mode
+ bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? TRUE : FALSE;
+
+ if (!extMode){
+ if (nml01 || nml02 || xtRate) continue;
+ }
+ //test modulation
+ if (!testModulation(mode, modread)) continue;
+
+ *offset = idx;
+ if (!testBitRate(bitRate, mode)) continue;
+ return TRUE;
}
- if ( resv== 0x00) return TRUE;
return FALSE;
}
void printT55xxBlock(const char *demodStr){
+ uint8_t i = config.offset;
+ uint8_t endpos = 32 + i;
uint32_t blockData = 0;
- uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};
-
- if ( !DemodBufferLen)
+ uint8_t bits[64] = {0x00};
+
+ if ( !DemodBufferLen) return;
+
+ if ( endpos > DemodBufferLen){
+ PrintAndLog("The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32);
return;
-
- int i =0;
- for (;i<DemodBufferLen;++i)
- bits[i]=DemodBuffer[i];
-
- blockData = PackBits(1, 32, bits);
- PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits+1,32), demodStr);
+ }
+
+ for (; i < endpos; ++i)
+ bits[i - config.offset]=DemodBuffer[i];
+
+ blockData = PackBits(0, 32, bits);
+ PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits,32), demodStr);
}
-/*
-FSK1 / FSK1a
-size = fskdemod(dest, size, 32, 0, 8, 10); // fsk1 RF/32
-size = fskdemod(dest, size, 32, 1, 8, 10); // fsk1a RF/32
+int special(const char *Cmd) {
+ uint32_t blockData = 0;
+ uint8_t bits[32] = {0x00};
+
+ PrintAndLog("[OFFSET] [DATA] [BINARY]");
+ PrintAndLog("----------------------------------------------------");
+ int i,j = 0;
+ for (; j < 64; ++j){
+
+ for (i = 0; i < 32; ++i)
+ bits[i]=DemodBuffer[j+i];
+
+ blockData = PackBits(0, 32, bits);
+
+ PrintAndLog("[%02d] 0x%08X %s",j , blockData, sprint_bin(bits,32));
+ }
+ return 0;
+}
-FSK2 / FSK2a
-size = fskdemod(dest, size, 32, 0, 10, 8); // fsk2 RF/32
-size = fskdemod(dest, size, 32, 1, 10, 8); // fsk2a RF/32
-size = fskdemod(dest, size, 50, 1, 10, 8); // fsk2a RF/50
-size = fskdemod(dest, size, 64, 1, 10, 8); // FSK2a RF/64
+void printConfiguration( t55xx_conf_block_t b){
+ PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );
+ PrintAndLog("Bit Rate : %s", GetBitRateStr(b.bitrate) );
+ PrintAndLog("Inverted : %s", (b.inverted) ? "Yes" : "No" );
+ PrintAndLog("Offset : %d", b.offset);
+ PrintAndLog("Block0 : 0x%08X", b.block0);
+ PrintAndLog("");
+}
-PSK1
-errCnt = pskRawDemod(bits, &bitlen, 32, 0);
-*/
int CmdT55xxWriteBlock(const char *Cmd)
{
int block = 8; //default to invalid block
@@ -439,16 +705,14 @@ int CmdT55xxWriteBlock(const char *Cmd)
}
if (block > 7) {
- PrintAndLog("Block must be between 0 and 7");
+ PrintAndLog("Block number must be between 0 and 7");
return 1;
}
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};
c.d.asBytes[0] = 0x0;
- PrintAndLog("Writing to T55x7");
- PrintAndLog("block : %d", block);
- PrintAndLog("data : 0x%08X", data);
+ PrintAndLog("Writing to block: %d data : 0x%08X", block, data);
//Password mode
if (res == 3) {
@@ -467,29 +731,18 @@ int CmdT55xxReadTrace(const char *Cmd)
if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H')
return usage_t55xx_trace();
- if ( strlen(Cmd)==0){
+ if (strlen(Cmd)==0)
+ AquireData( TRACE_BLOCK );
- UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};
- SendCommand(&c);
- if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
- PrintAndLog("command execution time out");
- return 1;
- }
+ if (!DecodeT55xxBlock()) return 1;
- uint8_t got[12000];
- GetFromBigBuf(got,sizeof(got),0);
- WaitForResponse(CMD_ACK,NULL);
- setGraphBuf(got, 12000);
- }
-
- DecodeT55xxBlock();
-
- if ( !DemodBufferLen)
- return 2;
+ if ( !DemodBufferLen) return 1;
RepaintGraphWindow();
-
- uint8_t si = 5;
+ uint8_t repeat = 0;
+ if (config.offset > 5)
+ repeat = 32;
+ uint8_t si = config.offset+repeat;
uint32_t bl0 = PackBits(si, 32, DemodBuffer);
uint32_t bl1 = PackBits(si+32, 32, DemodBuffer);
@@ -509,8 +762,8 @@ int CmdT55xxReadTrace(const char *Cmd)
PrintAndLog("-- T55xx Trace Information ----------------------------------");
PrintAndLog("-------------------------------------------------------------");
PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1) : 0x%02X (%d)", acl, acl);
- PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6) : 0x%02X (%d)", mfc, mfc);
- PrintAndLog(" CID : 0x%02X (%d)", cid, cid);
+ PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6) : 0x%02X (%d) - %s", mfc, mfc, getTagInfo(mfc));
+ PrintAndLog(" CID : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));
PrintAndLog(" ICR IC Revision : %d",icr );
PrintAndLog(" Manufactured");
PrintAndLog(" Year/Quarter : %d/%d",year, quarter );
@@ -519,9 +772,12 @@ int CmdT55xxReadTrace(const char *Cmd)
PrintAndLog(" Die Number : %d", dw);
PrintAndLog("-------------------------------------------------------------");
PrintAndLog(" Raw Data - Page 1");
- PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+5,32) );
- PrintAndLog(" Block 0 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+37,32) );
+ PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+config.offset+repeat,32) );
+ PrintAndLog(" Block 1 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
PrintAndLog("-------------------------------------------------------------");
+
+ if ( acl != 0xE0 )
+ PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");
/*
TRACE - BLOCK O
Bits Definition HEX
@@ -550,40 +806,17 @@ int CmdT55xxInfo(const char *Cmd){
*/
char cmdp = param_getchar(Cmd, 0);
- if (cmdp == 'h' || cmdp == 'H')
+ if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H')
return usage_t55xx_info();
- if (strlen(Cmd)==0){
-
- // read block 0, Page 0. Configuration.
- UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, 0, 0}};
- c.d.asBytes[0] = 0x0;
-
- //Password mode
- // if ( res == 2 ) {
- // c.arg[2] = password;
- // c.d.asBytes[0] = 0x1;
- // }
-
- SendCommand(&c);
- if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
- PrintAndLog("command execution time out");
- return 1;
- }
-
- uint8_t got[12000];
- GetFromBigBuf(got,sizeof(got),0);
- WaitForResponse(CMD_ACK,NULL);
- setGraphBuf(got, 12000);
- }
+ if (strlen(Cmd)==0)
+ AquireData( CONFIGURATION_BLOCK );
- DecodeT55xxBlock();
+ if (!DecodeT55xxBlock()) return 1;
- if ( !DemodBufferLen)
- return 2;
-
-
- uint8_t si = 1;
+ if ( !DemodBufferLen) return 1;
+
+ uint8_t si = config.offset;
uint32_t bl0 = PackBits(si, 32, DemodBuffer);
uint32_t safer = PackBits(si, 4, DemodBuffer); si += 4;
@@ -609,7 +842,7 @@ int CmdT55xxInfo(const char *Cmd){
PrintAndLog(" Data bit rate : %s", GetBitRateStr(dbr));
PrintAndLog(" eXtended mode : %s", (extend) ? "Yes - Warning":"No");
PrintAndLog(" Modulation : %s", GetModulationStr(datamod));
- PrintAndLog(" PSK clock freq : %d", pskcf);
+ PrintAndLog(" PSK clock frequency : %d", pskcf);
PrintAndLog(" AOR - Answer on Request : %s", (aor) ? "Yes":"No");
PrintAndLog(" OTP - One Time Pad : %s", (otp) ? "Yes - Warning":"No" );
PrintAndLog(" Max block : %d", maxblk);
@@ -620,7 +853,7 @@ int CmdT55xxInfo(const char *Cmd){
PrintAndLog(" POR-Delay : %s", (por) ? "Yes":"No");
PrintAndLog("-------------------------------------------------------------");
PrintAndLog(" Raw Data - Page 0");
- PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+5,32) );
+ PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+config.offset,32) );
PrintAndLog("-------------------------------------------------------------");
return 0;
@@ -657,6 +890,39 @@ int CmdT55xxDump(const char *Cmd){
return 0;
}
+int AquireData( uint8_t block ){
+
+ UsbCommand c;
+
+ if ( block == CONFIGURATION_BLOCK )
+ c.cmd = CMD_T55XX_READ_BLOCK;
+ else if (block == TRACE_BLOCK )
+ c.cmd = CMD_T55XX_READ_TRACE;
+
+ c.arg[0] = 0x00;
+ c.arg[1] = 0x00;
+ c.arg[2] = 0x00;
+ c.d.asBytes[0] = 0x0;
+
+ //Password mode
+ // if ( res == 2 ) {
+ // c.arg[2] = password;
+ // c.d.asBytes[0] = 0x1;
+ // }
+
+ SendCommand(&c);
+ if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
+ PrintAndLog("command execution time out");
+ return 1;
+ }
+
+ uint8_t got[12000];
+ GetFromBigBuf(got,sizeof(got),0);
+ WaitForResponse(CMD_ACK,NULL);
+ setGraphBuf(got, 12000);
+ return 0;
+}
+
char * GetBitRateStr(uint32_t id){
static char buf[40];
char *retStr = buf;
@@ -694,7 +960,7 @@ char * GetBitRateStr(uint32_t id){
}
char * GetSaferStr(uint32_t id){
- static char buf[40];
+ static char buf[40];
char *retStr = buf;
sprintf(retStr,"%d",id);
@@ -708,7 +974,7 @@ char * GetSaferStr(uint32_t id){
return buf;
}
char * GetModulationStr( uint32_t id){
- static char buf[40];
+ static char buf[40];
char *retStr = buf;
switch (id){
@@ -742,6 +1008,9 @@ char * GetModulationStr( uint32_t id){
case 16:
sprintf(retStr,"%d - Biphase",id);
break;
+ case 0x18:
+ sprintf(retStr,"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id);
+ break;
case 17:
sprintf(retStr,"%d - Reserved",id);
break;
@@ -752,30 +1021,90 @@ char * GetModulationStr( uint32_t id){
return buf;
}
+char * GetModelStrFromCID(uint32_t cid){
+
+ static char buf[10];
+ char *retStr = buf;
+
+ if (cid == 1) sprintf(retStr,"ATA5577M1");
+ if (cid == 2) sprintf(retStr,"ATA5577M2");
+ return buf;
+}
+
+char * GetSelectedModulationStr( uint8_t id){
+
+ static char buf[16];
+ char *retStr = buf;
+
+ switch (id){
+ case DEMOD_FSK:
+ sprintf(retStr,"FSK");
+ break;
+ case DEMOD_FSK1:
+ sprintf(retStr,"FSK1");
+ break;
+ case DEMOD_FSK1a:
+ sprintf(retStr,"FSK1a");
+ break;
+ case DEMOD_FSK2:
+ sprintf(retStr,"FSK2");
+ break;
+ case DEMOD_FSK2a:
+ sprintf(retStr,"FSK2a");
+ break;
+ case DEMOD_ASK:
+ sprintf(retStr,"ASK");
+ break;
+ case DEMOD_NRZ:
+ sprintf(retStr,"DIRECT/NRZ");
+ break;
+ case DEMOD_PSK1:
+ sprintf(retStr,"PSK1");
+ break;
+ case DEMOD_PSK2:
+ sprintf(retStr,"PSK2");
+ break;
+ case DEMOD_PSK3:
+ sprintf(retStr,"PSK3");
+ break;
+ case DEMOD_BI:
+ sprintf(retStr,"BIPHASE");
+ break;
+ case DEMOD_BIa:
+ sprintf(retStr,"BIPHASEa - (CDP)");
+ break;
+ default:
+ sprintf(retStr,"(Unknown)");
+ break;
+ }
+ return buf;
+}
+
uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
int i = start;
int j = len-1;
- if (len > 32) {
- return 0;
- }
- uint32_t tmp = 0;
- for (; j >= 0; --j, ++i){
+
+ if (len > 32) return 0;
+
+ uint32_t tmp = 0;
+ for (; j >= 0; --j, ++i)
tmp |= bits[i] << j;
- }
+
return tmp;
}
static command_t CommandTable[] =
{
{"help", CmdHelp, 1, "This help"},
- {"config", CmdT55xxSetConfig, 1, "Set T55XX config for modulation, inversed data"},
- {"detect", CmdT55xxDetect, 0, "Try detecting the tag modulation from reading the configuration block."},
+ {"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
+ {"detect", CmdT55xxDetect, 0, "[1] Try detecting the tag modulation from reading the configuration block."},
{"read", CmdT55xxReadBlock, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},
{"write", CmdT55xxWriteBlock,0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},
{"trace", CmdT55xxReadTrace, 0, "[1] Show T55xx traceability data (page 1/ blk 0-1)"},
{"info", CmdT55xxInfo, 0, "[1] Show T55xx configuration data (page 0/ blk 0)"},
{"dump", CmdT55xxDump, 0, "[password] Dump T55xx card block 0-7. [optional password]"},
+ {"special", special, 0, "Show block changes with 64 different offsets"},
{NULL, NULL, 0, NULL}
};