X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/545158b39874595933a3358e6c4685249ce62d3f..ba3fd680fb91335eabb96601fa3ff8ee460b6ede:/client/cmdlft55xx.c
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index b33c165a..a75d2fd3 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -10,6 +10,7 @@
#include <stdio.h>
#include <string.h>
#include <inttypes.h>
+#include <time.h>
#include "proxmark3.h"
#include "ui.h"
#include "graph.h"
@@ -23,22 +24,27 @@
#include "lfdemod.h"
#include "../common/crc.h"
#include "../common/iso14443crc.h"
+#include "cmdhf14a.h"
+
+#define CONFIGURATION_BLOCK 0x00
+#define TRACE_BLOCK 0x01
// Default configuration
-t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inversed = FALSE, .offset = 0x00, .block0 = 0x00};
+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] [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(" o [offset] Set offset, where data should start decode in bitstream");
+ 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 i 1 o 3 - FSK demodulation, inverse data, offset=3,start from bitpos 3 to decode 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;
}
@@ -107,14 +113,15 @@ int usage_t55xx_detect(){
static int CmdHelp(const char *Cmd);
-int CmdT55xxSetConfig(const char *Cmd){
+int CmdT55xxSetConfig(const char *Cmd) {
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)
{
tmp = param_getchar(Cmd, cmdp);
@@ -123,38 +130,70 @@ int CmdT55xxSetConfig(const char *Cmd){
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':
param_getstr(Cmd, cmdp+1, modulation);
cmdp += 2;
-
- if ( strcmp(modulation, "FSK" ) == 0) config.modulation = DEMOD_FSK;
- else if ( strcmp(modulation, "ASK" ) == 0) config.modulation = DEMOD_ASK;
- else if ( strcmp(modulation, "PSK" ) == 0) config.modulation = DEMOD_PSK;
- else if ( strcmp(modulation, "NZ" ) == 0) config.modulation = DEMOD_NZR;
- else if ( strcmp(modulation, "BI" ) == 0) config.modulation = DEMOD_BI;
+
+ if ( strcmp(modulation, "FSK" ) == 0)
+ 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)
+ 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)
+ config.modulation = DEMOD_BI;
else {
PrintAndLog("Unknown modulation '%s'", modulation);
errors = TRUE;
}
break;
case 'i':
- config.inversed = 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);
+ errors |= param_getdec(Cmd, cmdp+1, &offset);
if ( !errors )
config.offset = offset;
- cmdp += 2;
+ cmdp+=2;
break;
default:
PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
errors = TRUE;
break;
}
-
- PrintAndLog(" %c %d [%d]", param_getchar(Cmd, cmdp) , errors, cmdp);
}
+
// No args
if (cmdp == 0) {
printConfiguration( config );
@@ -163,14 +202,13 @@ int CmdT55xxSetConfig(const char *Cmd){
//Validations
if (errors)
return usage_t55xx_config();
-
- config.block0 = 0;
- printConfiguration( config );
+
+ 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
@@ -208,144 +246,208 @@ 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[9] = {0x00};
char *cmdStr = buf;
+ int ans = 0;
+ uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};
- // clearing the DemodBuffer.
DemodBufferLen = 0x00;
-
- // use the configuration
+
switch( config.modulation ){
- case 1:
- sprintf(cmdStr,"0 %d", config.inversed );
- FSKrawDemod(cmdStr, FALSE);
+ case DEMOD_FSK:
+ 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);
+ case DEMOD_FSK1:
+ case DEMOD_FSK1a:
+ sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );
+ CmdLtrim(cmdStr);
+ sprintf(cmdStr,"%d %d 8 5", bitRate[config.bitrate], config.inverted );
+ ans = FSKrawDemod(cmdStr, FALSE);
break;
- case 3:
- sprintf(cmdStr,"0 %d 1", config.inversed );
- PSKDemod(cmdStr, FALSE);
+ case DEMOD_FSK2:
+ case DEMOD_FSK2a:
+ sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );
+ CmdLtrim(cmdStr);
+ sprintf(cmdStr,"%d %d 10 8", bitRate[config.bitrate], config.inverted );
+ ans = FSKrawDemod(cmdStr, FALSE);
break;
- case 4:
- sprintf(cmdStr,"0 %d 1", config.inversed );
- NRZrawDemod(cmdStr, FALSE);
+ case DEMOD_ASK:
+ sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );
+ ans = ASKmanDemod(cmdStr, FALSE, FALSE);
break;
- case 5:
- //BiphaseRawDecode("0",FALSE);
+ case DEMOD_PSK1:
+ sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );
+ ans = PSKDemod(cmdStr, FALSE);
+ break;
+ case DEMOD_PSK2:
+ sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );
+ 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:
+ case DEMOD_BIa:
+ sprintf(cmdStr,"0 %d %d 0", bitRate[config.bitrate], config.inverted );
+ 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;
-
- //Password mode
- // if ( res == 2 ) {
- // c.arg[2] = password;
- // c.d.asBytes[0] = 0x1;
- // }
+ if (strlen(Cmd)==0)
+ AquireData( CONFIGURATION_BLOCK );
- 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()){
+ 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;
- tests[hits].inversed = FALSE;
+ 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()) {
+ if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) {
tests[hits].modulation = DEMOD_FSK;
- tests[hits].inversed = TRUE;
+ 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()) {
+ }
+ } else {
+ if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {
tests[hits].modulation = DEMOD_ASK;
- tests[hits].inversed = FALSE;
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test()) {
+ if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {
tests[hits].modulation = DEMOD_ASK;
- tests[hits].inversed = TRUE;
+ tests[hits].inverted = TRUE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- if ( NRZrawDemod("0 0 1", FALSE) && test()) {
- tests[hits].modulation = DEMOD_NZR;
- tests[hits].inversed = FALSE;
+ 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 = DEMOD_NZR;
- tests[hits].inversed = TRUE;
+ 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 = DEMOD_PSK;
- tests[hits].inversed = FALSE;
+ 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 = DEMOD_PSK;
- tests[hits].inversed = TRUE;
+ 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 = DEMOD_BI;
- // tests[hits].inversed = FALSE;
- //}
- // if (!BiphaseRawDecode("1",FALSE) && test()) {
- // tests[++hits].modulation = DEMOD_BI;
- // tests[hits].inversed = TRUE;
- // }
}
if ( hits == 1) {
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;
}
@@ -360,53 +462,183 @@ bool tryDetectModulation(){
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;
-
- if ( PackBits(0, 32, DemodBuffer) == 0x00 )
- return FALSE;
-
+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:
+ case DEMOD_BIa:
+ detRate = GetAskClock("",FALSE, FALSE);
+ if (expected[readRate] == detRate) {
+ config.bitrate = readRate;
+ return TRUE;
+ }
+ break;
+ default:
+ return FALSE;
+ }
+ return FALSE;
+}
+
+bool test(uint8_t mode, uint8_t *offset){
+
+ if ( !DemodBufferLen) return FALSE;
uint8_t si = 0;
-
- 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;
+ for (uint8_t idx = 0; idx < 64; idx++){
+ si = idx;
+ if ( PackBits(si, 32, DemodBuffer) == 0x00 ) continue; // configuration block with only zeros is impossible.
- //PrintAndLog("test: %X %X %X ", safer, resv, extend);
-
- // 2nibble must be zeroed.
- if ( resv > 0x00) return FALSE;
+ 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;
- if ( safer == 0x6 || safer == 0x9){
- if ( extend == 0x00)
- return TRUE;
+ 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){
+void printT55xxBlock(const char *blockNum){
+ uint8_t i = config.offset;
+ uint8_t endpos = 32 + i;
uint32_t blockData = 0;
uint8_t bits[64] = {0x00};
-
- if ( !DemodBufferLen)
- return;
-
- if ( config.offset > DemodBufferLen){
- PrintAndLog("The configured offset is to big. (%d > %d)", config.offset, DemodBufferLen);
+
+ if ( !DemodBufferLen) return;
+
+ if ( endpos > DemodBufferLen){
+ PrintAndLog("The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32);
return;
}
-
- int i = config.offset;
- int pos = 32 + config.offset;
- for (; i < pos; ++i)
+
+ 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);
+ PrintAndLog("[%s] 0x%08X %s", blockNum, blockData, sprint_bin(bits,32));
}
int special(const char *Cmd) {
@@ -416,23 +648,24 @@ int special(const char *Cmd) {
PrintAndLog("[OFFSET] [DATA] [BINARY]");
PrintAndLog("----------------------------------------------------");
int i,j = 0;
- for (; j < 128; ++j){
+ for (; j < 64; ++j){
for (i = 0; i < 32; ++i)
bits[i]=DemodBuffer[j+i];
blockData = PackBits(0, 32, bits);
- PrintAndLog("[%d] 0x%08X %s",j , blockData, sprint_bin(bits,32));
+
+ PrintAndLog("[%02d] 0x%08X %s",j , blockData, sprint_bin(bits,32));
}
-
return 0;
}
void printConfiguration( t55xx_conf_block_t b){
PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );
- PrintAndLog("Inverted : %s", (b.inversed) ? "Yes" : "No" );
+ PrintAndLog("Bit Rate : %s", GetBitRateStr(b.bitrate) );
+ PrintAndLog("Inverted : %s", (b.inverted) ? "Yes" : "No" );
PrintAndLog("Offset : %d", b.offset);
- PrintAndLog("Block0 : %08X", b.block0);
+ PrintAndLog("Block0 : 0x%08X", b.block0);
PrintAndLog("");
}
@@ -456,16 +689,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) {
@@ -484,31 +715,21 @@ int CmdT55xxReadTrace(const char *Cmd)
if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H')
return usage_t55xx_trace();
- if ( strlen(Cmd)==0){
-
- UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};
- 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( TRACE_BLOCK );
- DecodeT55xxBlock();
+ if (!DecodeT55xxBlock()) return 1;
- if ( !DemodBufferLen)
- return 2;
+ if ( !DemodBufferLen) return 1;
RepaintGraphWindow();
-
- uint8_t si = config.offset;
+ 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);
+ // uint32_t bl2 = PackBits(si+64, 32, DemodBuffer);
uint32_t acl = PackBits(si, 8, DemodBuffer); si += 8;
uint32_t mfc = PackBits(si, 8, DemodBuffer); si += 8;
@@ -516,29 +737,42 @@ int CmdT55xxReadTrace(const char *Cmd)
uint32_t icr = PackBits(si, 3, DemodBuffer); si += 3;
uint32_t year = PackBits(si, 4, DemodBuffer); si += 4;
uint32_t quarter = PackBits(si, 2, DemodBuffer); si += 2;
- uint32_t lotid = PackBits(si, 12, DemodBuffer); si += 12;
+ uint32_t lotid = PackBits(si, 14, DemodBuffer); si += 14;
uint32_t wafer = PackBits(si, 5, DemodBuffer); si += 5;
uint32_t dw = PackBits(si, 15, DemodBuffer);
- year += 2000;
- PrintAndLog("");
+ time_t t = time(NULL);
+ struct tm tm = *localtime(&t);
+ if ( year > tm.tm_year-110)
+ year += 2000;
+ else
+ year += 2010;
+
+ if ( acl != 0xE0 ) {
+ PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");
+ return 1;
+ }
+
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 );
+ PrintAndLog(" Year/Quarter : 20?%d/%d",year, quarter);
PrintAndLog(" Lot ID : %d", lotid );
PrintAndLog(" Wafer number : %d", wafer);
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 1 : 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(" Block 2 : 0x%08X %s", bl2, sprint_bin(DemodBuffer+config.offset+repeat+64,32) );
PrintAndLog("-------------------------------------------------------------");
+
+
/*
TRACE - BLOCK O
Bits Definition HEX
@@ -567,39 +801,16 @@ 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 1;
- if ( !DemodBufferLen)
- return 2;
-
-
uint8_t si = config.offset;
uint32_t bl0 = PackBits(si, 32, DemodBuffer);
@@ -626,7 +837,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);
@@ -637,7 +848,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;
@@ -674,36 +885,69 @@ 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];
+ static char buf[20];
char *retStr = buf;
switch (id){
case 0:
- sprintf(retStr,"%d - RF/8",id);
+ snprintf(retStr,sizeof(buf),"%d - RF/8",id);
break;
case 1:
- sprintf(retStr,"%d - RF/16",id);
+ snprintf(retStr,sizeof(buf),"%d - RF/16",id);
break;
case 2:
- sprintf(retStr,"%d - RF/32",id);
+ snprintf(retStr,sizeof(buf),"%d - RF/32",id);
break;
case 3:
- sprintf(retStr,"%d - RF/40",id);
+ snprintf(retStr,sizeof(buf),"%d - RF/40",id);
break;
case 4:
- sprintf(retStr,"%d - RF/50",id);
+ snprintf(retStr,sizeof(buf),"%d - RF/50",id);
break;
case 5:
- sprintf(retStr,"%d - RF/64",id);
+ snprintf(retStr,sizeof(buf),"%d - RF/64",id);
break;
case 6:
- sprintf(retStr,"%d - RF/100",id);
+ snprintf(retStr,sizeof(buf),"%d - RF/100",id);
break;
case 7:
- sprintf(retStr,"%d - RF/128",id);
+ snprintf(retStr,sizeof(buf),"%d - RF/128",id);
break;
default:
- sprintf(retStr,"%d - (Unknown)",id);
+ snprintf(retStr,sizeof(buf),"%d - (Unknown)",id);
break;
}
@@ -711,87 +955,122 @@ char * GetBitRateStr(uint32_t id){
}
char * GetSaferStr(uint32_t id){
- static char buf[40];
+ static char buf[20];
char *retStr = buf;
- sprintf(retStr,"%d",id);
+ snprintf(retStr,sizeof(buf),"%d",id);
if (id == 6) {
- sprintf(retStr,"%d - passwd",id);
+ snprintf(retStr,sizeof(buf),"%d - passwd",id);
}
if (id == 9 ){
- sprintf(retStr,"%d - testmode",id);
+ snprintf(retStr,sizeof(buf),"%d - testmode",id);
}
return buf;
}
+
char * GetModulationStr( uint32_t id){
- static char buf[40];
+ static char buf[60];
char *retStr = buf;
switch (id){
case 0:
- sprintf(retStr,"%d - DIRECT (ASK/NRZ)",id);
+ snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id);
break;
case 1:
- sprintf(retStr,"%d - PSK 1 phase change when input changes",id);
+ snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id);
break;
case 2:
- sprintf(retStr,"%d - PSK 2 phase change on bitclk if input high",id);
+ snprintf(retStr,sizeof(buf),"%d - PSK 2 phase change on bitclk if input high",id);
break;
case 3:
- sprintf(retStr,"%d - PSK 3 phase change on rising edge of input",id);
+ snprintf(retStr,sizeof(buf),"%d - PSK 3 phase change on rising edge of input",id);
break;
case 4:
- sprintf(retStr,"%d - FSK 1 RF/8 RF/5",id);
+ snprintf(retStr,sizeof(buf),"%d - FSK 1 RF/8 RF/5",id);
break;
case 5:
- sprintf(retStr,"%d - FSK 2 RF/8 RF/10",id);
+ snprintf(retStr,sizeof(buf),"%d - FSK 2 RF/8 RF/10",id);
break;
case 6:
- sprintf(retStr,"%d - FSK 1a RF/5 RF/8",id);
+ snprintf(retStr,sizeof(buf),"%d - FSK 1a RF/5 RF/8",id);
break;
case 7:
- sprintf(retStr,"%d - FSK 2a RF/10 RF/8",id);
+ snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10 RF/8",id);
break;
case 8:
- sprintf(retStr,"%d - Manschester",id);
+ snprintf(retStr,sizeof(buf),"%d - Manschester",id);
break;
case 16:
- sprintf(retStr,"%d - Biphase",id);
+ snprintf(retStr,sizeof(buf),"%d - Biphase",id);
+ break;
+ case 0x18:
+ snprintf(retStr,sizeof(buf),"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id);
break;
case 17:
- sprintf(retStr,"%d - Reserved",id);
+ snprintf(retStr,sizeof(buf),"%d - Reserved",id);
break;
default:
- sprintf(retStr,"0x%02X (Unknown)",id);
+ snprintf(retStr,sizeof(buf),"0x%02X (Unknown)",id);
break;
}
return buf;
}
+char * GetModelStrFromCID(uint32_t cid){
+
+ static char buf[10];
+ char *retStr = buf;
+
+ if (cid == 1) snprintf(retStr, sizeof(buf),"ATA5577M1");
+ if (cid == 2) snprintf(retStr, sizeof(buf),"ATA5577M2");
+ return buf;
+}
+
char * GetSelectedModulationStr( uint8_t id){
- static char buf[16];
+ static char buf[20];
char *retStr = buf;
-
+
switch (id){
case DEMOD_FSK:
- sprintf(retStr,"FSK (%d)",id);
+ snprintf(retStr,sizeof(buf),"FSK");
+ break;
+ case DEMOD_FSK1:
+ snprintf(retStr,sizeof(buf),"FSK1");
+ break;
+ case DEMOD_FSK1a:
+ snprintf(retStr,sizeof(buf),"FSK1a");
+ break;
+ case DEMOD_FSK2:
+ snprintf(retStr,sizeof(buf),"FSK2");
+ break;
+ case DEMOD_FSK2a:
+ snprintf(retStr,sizeof(buf),"FSK2a");
break;
case DEMOD_ASK:
- sprintf(retStr,"ASK (%d)",id);
+ snprintf(retStr,sizeof(buf),"ASK");
break;
- case DEMOD_NZR:
- sprintf(retStr,"DIRECT/NRZ (%d)",id);
+ case DEMOD_NRZ:
+ snprintf(retStr,sizeof(buf),"DIRECT/NRZ");
break;
- case DEMOD_PSK:
- sprintf(retStr,"PSK (%d)",id);
+ case DEMOD_PSK1:
+ snprintf(retStr,sizeof(buf),"PSK1");
+ break;
+ case DEMOD_PSK2:
+ snprintf(retStr,sizeof(buf),"PSK2");
+ break;
+ case DEMOD_PSK3:
+ snprintf(retStr,sizeof(buf),"PSK3");
break;
case DEMOD_BI:
- sprintf(retStr,"BIPHASE (%d)",id);
+ snprintf(retStr,sizeof(buf),"BIPHASE");
+ break;
+ case DEMOD_BIa:
+ snprintf(retStr,sizeof(buf),"BIPHASEa - (CDP)");
break;
default:
- sprintf(retStr,"(Unknown)");
+ snprintf(retStr,sizeof(buf),"(Unknown)");
break;
}
return buf;
@@ -801,27 +1080,27 @@ 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, "Shows how a datablock changes with 32 different offsets"},
+ {"special", special, 0, "Show block changes with 64 different offsets"},
{NULL, NULL, 0, NULL}
};