X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/149aeadaa609b01db86ba3b4ee23b317f16bede5..0a966150a0bf41466c3c3e0e39672892bf6bdd01:/client/cmdlft55xx.c

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 31261a4f..6ea9d2d3 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -23,15 +23,16 @@
 
 
 #define LF_TRACE_BUFF_SIZE 12000 // 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 = 
 static int CmdHelp(const char *Cmd);
 
 
 int CmdReadBlk(const char *Cmd)
 {
-	int Block = -1;
-	sscanf(Cmd, "%d", &Block);
+	int block = -1;
+	sscanf(Cmd, "%d", &block);
 
-	if ((Block > 7) | (Block < 0)) {
+	if ((block > 7) | (block < 0)) {
 		PrintAndLog("Block must be between 0 and 7");
 		return 1;
 	}	
@@ -40,23 +41,22 @@ int CmdReadBlk(const char *Cmd)
 	c.cmd = CMD_T55XX_READ_BLOCK;
 	c.d.asBytes[0] = 0x00;
 	c.arg[0] = 0;
-	c.arg[1] = Block;
+	c.arg[1] = block;
 	c.arg[2] = 0;
 	SendCommand(&c);
 	WaitForResponse(CMD_ACK, NULL);
 	
-//	uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};
+	uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};
 	
-	// GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..
-	// WaitForResponseTimeout(CMD_ACK,NULL, 1500);
-
-	// for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {
-		// GraphBuffer[j] = (int)data[j];
-	// }
-	// GraphTraceLen = LF_TRACE_BUFF_SIZE;
-	CmdSamples("12000");
-	ManchesterDemod(Block);
-	// RepaintGraphWindow();
+	GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,3560);  //3560 -- should be offset..
+	WaitForResponseTimeout(CMD_ACK,NULL, 1500);
+
+	for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {
+		GraphBuffer[j] = (int)data[j];
+	}
+	GraphTraceLen = LF_TRACE_BUFF_SIZE;
+	ManchesterDemod(block);
+	RepaintGraphWindow();
   return 0;
 }
 
@@ -175,10 +175,10 @@ int CmdReadTrace(const char *Cmd)
 		GraphTraceLen = LF_TRACE_BUFF_SIZE;
 	}
 	
-	uint8_t bits[1000] = {0x00};
+	uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};
 	uint8_t * bitstream = bits;
 	
-	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);
+	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN);
 	RepaintGraphWindow();
 
 	uint8_t si = 5;
@@ -253,10 +253,10 @@ int CmdInfo(const char *Cmd){
 		CmdReadBlk("0");
 	}	
 
-	uint8_t bits[1000] = {0x00};
+	uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};
 	uint8_t * bitstream = bits;
 	
-	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);
+	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN);
 	
 	uint8_t si = 5;
 	uint32_t bl0      = PackBits(si, 32, bitstream);
@@ -315,16 +315,16 @@ int CmdDump(const char *Cmd){
 	}
 	
 	if ( hasPwd ){
-		if (param_gethex(Cmd, 0, pwd, 4)) {
-			PrintAndLog("password must include 4 HEX symbols");
+		if (param_gethex(Cmd, 0, pwd, 8)) {
+			PrintAndLog("password must include 8 HEX symbols");
 			return 0;
 		}
 	}
-
+	
 	for ( int i = 0; i <8; ++i){
 		memset(s,0,sizeof(s));
 		if ( hasPwd ) {
-			sprintf(s,"%d %s", i, sprint_hex(pwd,4));
+			sprintf(s,"%d %02x%02x%02x%02x", i, pwd[0],pwd[1],pwd[2],pwd[3]);
 			CmdReadBlkPWD(s);
 		} else {
 			sprintf(s,"%d", i);
@@ -335,6 +335,9 @@ int CmdDump(const char *Cmd){
 }
 
 int CmdIceFsk(const char *Cmd){
+
+	if (!HasGraphData()) return 0;
+
 	iceFsk3(GraphBuffer, LF_TRACE_BUFF_SIZE);
 	RepaintGraphWindow();
 	return 0;
@@ -343,16 +346,18 @@ int CmdIceManchester(const char *Cmd){
 	ManchesterDemod( -1);
 	return 0;
 }
-int ManchesterDemod(int block){
+int ManchesterDemod(int blockNum){
 
-	int  blockNum = -1;
+	if (!HasGraphData()) return 0;
+		
 	uint8_t sizebyte = 32;
+	// the value 5 was selected during empirical studies of the decoded data. Some signal noise to skip.
 	uint8_t offset = 5;
 	uint32_t blockData;
-	uint8_t  bits[1000] = {0x00};
+	uint8_t  bits[LF_BITSSTREAM_LEN] = {0x00};
 	uint8_t * bitstream = bits;
 	
-	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream);	
+	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN);	
     blockData = PackBits(offset, sizebyte, bitstream);
 
 	if ( blockNum < 0)
@@ -463,6 +468,9 @@ 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){
 		tmp	|= bits[i] << j;
@@ -477,8 +485,8 @@ static command_t CommandTable[] =
   {"rdpwd",  CmdReadBlkPWD,  0, "<block> <password> -- Read T55xx block data with password mode"},
   {"wr",     CmdWriteBlk,    0, "<data> <block> -- Write T55xx block data (page 0)"},
   {"wrpwd",  CmdWriteBlkPWD, 0, "<data> <block> <password> -- Write T55xx block data with password"},
-  {"trace",  CmdReadTrace,   0, "[1] Read T55xx traceability data (page 1 / blk 0-1) "},
-  {"info",   CmdInfo,        0, "[1] Read T55xx configuration data (page0 /blk 0)"},
+  {"trace",  CmdReadTrace,   0, "[1] Read T55xx traceability data (page 1/ blk 0-1)"},
+  {"info",   CmdInfo,        0, "[1] Read T55xx configuration data (page 0/ blk 0)"},
   {"dump",   CmdDump,        0, "[password] Dump T55xx card block 0-7. optional with password"},
   {"fsk",    CmdIceFsk,      0, "FSK demod"},
   {"man",    CmdIceManchester,      0, "Manchester demod (with SST)"},