ADD: a CmdEM410xWatchnSpoof in cmdlfem4x.c , looks for a tag, then replays it.

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 9025e8f1b319ca670f07ed63af2bcabf92338fa5..d05f3fa1572e95b16e797b049d93630a858f90d5 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-//#include <inttypes.h>

 #include <limits.h>
 #include "proxmark3.h"
 #include "data.h"
 #include <limits.h>
 #include "proxmark3.h"
 #include "data.h"


@@ -125,7 +124,9 @@ int Cmdaskdemod(const char *Cmd)
   return 0;
 }
 
   return 0;
 }
 

-void printBitStream(uint8_t BitStream[], uint32_t bitLen){
+//by marshmellow
+void printBitStream(uint8_t BitStream[], uint32_t bitLen)
+{

   uint32_t i = 0;
   if (bitLen<16) {
     PrintAndLog("Too few bits found: %d",bitLen);
   uint32_t i = 0;
   if (bitLen<16) {
     PrintAndLog("Too few bits found: %d",bitLen);


@@ -153,6 +154,7 @@ void printBitStream(uint8_t BitStream[], uint32_t bitLen){
   }
   return; 
 }
   }
   return; 
 }

+//by marshmellow

 void printEM410x(uint64_t id)
 {
   if (id !=0){
 void printEM410x(uint64_t id)
 {
   if (id !=0){


@@ -179,26 +181,19 @@ void printEM410x(uint64_t id)
     return;
 }
 
     return;
 }
 

+//by marshmellow

 int CmdEm410xDecode(const char *Cmd)
 {
   uint64_t id=0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
   uint32_t i=0;
 int CmdEm410xDecode(const char *Cmd)
 {
   uint64_t id=0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
   uint32_t i=0;

-  for (i=0;i<GraphTraceLen;++i){
-    BitStream[i]=(uint8_t)(GraphBuffer[i]+128);
-  }
+  i=getFromGraphBuf(BitStream);

   id = Em410xDecode(BitStream,i);
   printEM410x(id);
   id = Em410xDecode(BitStream,i);
   printEM410x(id);

+  if (id>0) return 1;

   return 0;
 }
 
   return 0;
 }
 

-int getFromGraphBuf(uint8_t *buff)
-{
-  uint32_t i;
-  for (i=0;i<GraphTraceLen;++i)
-    buff[i]=(uint8_t)(GraphBuffer[i]+128);
-  return i;
-}

 
 //by marshmellow
 //takes 2 arguments - clock and invert both as integers
 
 //by marshmellow
 //takes 2 arguments - clock and invert both as integers


@@ -215,25 +210,17 @@ int Cmdaskmandemod(const char *Cmd)
     return 0;
   }
   uint32_t BitLen = getFromGraphBuf(BitStream);
     return 0;
   }
   uint32_t BitLen = getFromGraphBuf(BitStream);

-
+  //  PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);

   int errCnt=0;
    errCnt = askmandemod(BitStream, &BitLen,&clk,&invert);
   int errCnt=0;
    errCnt = askmandemod(BitStream, &BitLen,&clk,&invert);

-  if (errCnt==-1){  //if fatal error (or -1)
-    PrintAndLog("no data found"); 
+  if (errCnt<0){  //if fatal error (or -1)
+    // PrintAndLog("no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk); 

     return 0;
   } 
     return 0;
   } 

-  PrintAndLog("Using Clock: %d  and invert=%d",clk,invert);
-    //PrintAndLog("Data start pos:%d, lastBit:%d, stop pos:%d, numBits:%d",iii,lastBit,i,bitnum);
-    //move BitStream back to GraphBuffer
-    /*
-      ClearGraph(0);
-      for (i=0; i < bitnum; ++i){
-        GraphBuffer[i]=BitStream[i];
-      }
-      GraphTraceLen=bitnum;
-      RepaintGraphWindow();
-    */
-    //output
+  if (BitLen<16) return 0;
+  PrintAndLog("\nUsing Clock: %d - Invert: %d - Bits Found: %d",clk,invert,BitLen);
+  
+  //output

   if (errCnt>0){
     PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
   }
   if (errCnt>0){
     PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
   }


@@ -242,17 +229,19 @@ int Cmdaskmandemod(const char *Cmd)
   printBitStream(BitStream,BitLen);
   uint64_t lo =0;
   lo = Em410xDecode(BitStream,BitLen);
   printBitStream(BitStream,BitLen);
   uint64_t lo =0;
   lo = Em410xDecode(BitStream,BitLen);

-  printEM410x(lo);
-  
+  if (lo>0){
+    //set GraphBuffer for clone or sim command
+    setGraphBuf(BitStream,BitLen); 
+    PrintAndLog("EM410x pattern found: ");
+    printEM410x(lo);
+    return 1;
+  }
+  //if (BitLen>16) return 1;

   return 0;
 }
 
 //by marshmellow
   return 0;
 }
 
 //by marshmellow

-//biphase demod = 10 (or 01)=1 / 00 (or 11)=0
-
-
-//by marshmellow
-//manchester demod
+//manchester decode

 //stricktly take 10 and 01 and convert to 0 and 1
 int Cmdmandecoderaw(const char *Cmd)
 {
 //stricktly take 10 and 01 and convert to 0 and 1
 int Cmdmandecoderaw(const char *Cmd)
 {


@@ -271,7 +260,7 @@ int Cmdmandecoderaw(const char *Cmd)
     return 0;
   }
   bitnum=i;
     return 0;
   }
   bitnum=i;

-  errCnt=manrawdemod(BitStream,&bitnum);
+  errCnt=manrawdecode(BitStream,&bitnum);

   if (errCnt>=20){
     PrintAndLog("Too many errors: %d",errCnt);
     return 0;
   if (errCnt>=20){
     PrintAndLog("Too many errors: %d",errCnt);
     return 0;


@@ -290,16 +279,57 @@ int Cmdmandecoderaw(const char *Cmd)
     id = Em410xDecode(BitStream,i);
     printEM410x(id);     
   }
     id = Em410xDecode(BitStream,i);
     printEM410x(id);     
   }

-  return 0;
+  return 1;

 }
 
 }
 

+//by marshmellow
+//biphase decode
+//take 01 or 10 = 0 and 11 or 00 = 1
+//takes 1 argument "offset" default = 0 if 1 it will shift the decode by one bit
+//  since it is not like manchester and doesn't have an incorrect bit pattern we 
+//  cannot determine if our decode is correct or if it should be shifted by one bit
+//  the argument offset allows us to manually shift if the output is incorrect
+//  (better would be to demod and decode at the same time so we can distinguish large
+//    width waves vs small width waves to help the decode positioning) or askbiphdemod
+int CmdBiphaseDecodeRaw(const char *Cmd)
+{
+  int i = 0;
+  int errCnt=0;
+  int bitnum=0;
+  int offset=0;
+  int high=0, low=0;
+  sscanf(Cmd, "%i", &offset);    
+  uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+  //get graphbuffer & high and low
+  for (;i<GraphTraceLen;++i){
+    if(GraphBuffer[i]>high)high=GraphBuffer[i];
+    else if(GraphBuffer[i]<low)low=GraphBuffer[i];
+    BitStream[i]=GraphBuffer[i];
+  }
+  if (high>1 || low <0){
+    PrintAndLog("Error: please raw demod the wave first then decode");
+    return 0;
+  }
+  bitnum=i;
+  errCnt=BiphaseRawDecode(BitStream,&bitnum, offset);
+  if (errCnt>=20){
+    PrintAndLog("Too many errors attempting to decode: %d",errCnt);
+    return 0;
+  }
+  PrintAndLog("Biphase Decoded using offset: %d - # errors:%d - data:",offset,errCnt);
+  printBitStream(BitStream,bitnum);
+  PrintAndLog("\nif bitstream does not look right try offset=1");
+  return 1;
+}
+
+

 //by marshmellow
 //takes 2 arguments - clock and invert both as integers
 //attempts to demodulate ask only
 //prints binary found and saves in graphbuffer for further commands
 int Cmdaskrawdemod(const char *Cmd)
 {
 //by marshmellow
 //takes 2 arguments - clock and invert both as integers
 //attempts to demodulate ask only
 //prints binary found and saves in graphbuffer for further commands
 int Cmdaskrawdemod(const char *Cmd)
 {

-  uint32_t i;
+  

   int invert=0; 
   int clk=0; 
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
   int invert=0; 
   int clk=0; 
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};


@@ -310,31 +340,27 @@ int Cmdaskrawdemod(const char *Cmd)
   }
   int BitLen = getFromGraphBuf(BitStream);
   int errCnt=0;
   }
   int BitLen = getFromGraphBuf(BitStream);
   int errCnt=0;

-  errCnt = askrawdemod(BitStream, &BitLen,&clk,&invert);
+  errCnt = askrawdemod(BitStream, &BitLen, &clk, &invert);

   if (errCnt==-1){  //throw away static - allow 1 and -1 (in case of threshold command first)
     PrintAndLog("no data found"); 
     return 0;
   } 
   if (errCnt==-1){  //throw away static - allow 1 and -1 (in case of threshold command first)
     PrintAndLog("no data found"); 
     return 0;
   } 

-  PrintAndLog("Using Clock: %d  and invert=%d",clk,invert);
+  if (BitLen<16) return 0;
+  PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);

     //PrintAndLog("Data start pos:%d, lastBit:%d, stop pos:%d, numBits:%d",iii,lastBit,i,bitnum);
     //move BitStream back to GraphBuffer
     //PrintAndLog("Data start pos:%d, lastBit:%d, stop pos:%d, numBits:%d",iii,lastBit,i,bitnum);
     //move BitStream back to GraphBuffer

-    
-  ClearGraph(0);
-  for (i=0; i < BitLen; ++i){
-    GraphBuffer[i]=BitStream[i];
-  }
-  GraphTraceLen=BitLen;
-  RepaintGraphWindow();
-    
-    //output
+       setGraphBuf(BitStream, BitLen);
+       

   if (errCnt>0){
     PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
   }
   if (errCnt>0){
     PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
   }

+

   PrintAndLog("ASK demoded bitstream:");
   PrintAndLog("ASK demoded bitstream:");

+       

   // Now output the bitstream to the scrollback by line of 16 bits
   printBitStream(BitStream,BitLen);
   
   // Now output the bitstream to the scrollback by line of 16 bits
   printBitStream(BitStream,BitLen);
   

-  return 0;
+  return 1;

 }
 
 int CmdAutoCorr(const char *Cmd)
 }
 
 int CmdAutoCorr(const char *Cmd)


@@ -446,10 +472,6 @@ int CmdBitstream(const char *Cmd)
       bit ^= 1;
 
     AppendGraph(0, clock, bit);
       bit ^= 1;
 
     AppendGraph(0, clock, bit);

-  //    for (j = 0; j < (int)(clock/2); j++)
-  //      GraphBuffer[(i * clock) + j] = bit ^ 1;
-  //    for (j = (int)(clock/2); j < clock; j++)
-  //      GraphBuffer[(i * clock) + j] = bit;

   }
 
   RepaintGraphWindow();
   }
 
   RepaintGraphWindow();


@@ -475,52 +497,55 @@ int CmdDec(const char *Cmd)
 }
 
 /* Print our clock rate */
 }
 
 /* Print our clock rate */

+// uses data from graphbuffer 

 int CmdDetectClockRate(const char *Cmd)
 {
 int CmdDetectClockRate(const char *Cmd)
 {

-  int clock = DetectClock(0);
-  PrintAndLog("Auto-detected clock rate: %d", clock);
+  GetClock("",0,0);

   return 0;
 }
 
 //by marshmellow
 //fsk raw demod and print binary
   return 0;
 }
 
 //by marshmellow
 //fsk raw demod and print binary

-//takes 2 arguments - Clock and invert
-//defaults: clock = 50, invert=0
+//takes 4 arguments - Clock, invert, rchigh, rclow
+//defaults: clock = 50, invert=0, rchigh=10, rclow=8 (RF/10 RF/8 (fsk2a))

 int CmdFSKrawdemod(const char *Cmd)
 {
   //raw fsk demod  no manchester decoding no start bit finding just get binary from wave
   //set defaults
 int CmdFSKrawdemod(const char *Cmd)
 {
   //raw fsk demod  no manchester decoding no start bit finding just get binary from wave
   //set defaults

-  uint8_t rfLen = 50;
-  uint8_t invert=0;
+  int rfLen = 50;
+  int invert=0;
+  int fchigh=10;
+  int fclow=8;

   //set options from parameters entered with the command
   //set options from parameters entered with the command

+  sscanf(Cmd, "%i %i %i %i", &rfLen, &invert, &fchigh, &fclow);    
+  

   if (strlen(Cmd)>0 && strlen(Cmd)<=2) {
   if (strlen(Cmd)>0 && strlen(Cmd)<=2) {

-     rfLen=param_get8(Cmd, 0); //if rfLen option only is used
+     //rfLen=param_get8(Cmd, 0); //if rfLen option only is used

      if (rfLen==1){
       invert=1;   //if invert option only is used
       rfLen = 50;
      } else if(rfLen==0) rfLen=50;
   } 
      if (rfLen==1){
       invert=1;   //if invert option only is used
       rfLen = 50;
      } else if(rfLen==0) rfLen=50;
   } 

-  if (strlen(Cmd)>2) {
-    rfLen=param_get8(Cmd, 0);  //if both options are used
-    invert=param_get8(Cmd,1);
-  }
-  PrintAndLog("Args invert: %d \nClock:%d",invert,rfLen);
+  PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow);

   uint32_t i=0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
   uint32_t BitLen = getFromGraphBuf(BitStream);
   uint32_t i=0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
   uint32_t BitLen = getFromGraphBuf(BitStream);

-  int size  = fskdemod(BitStream,BitLen,rfLen,invert); 
-  
-  PrintAndLog("FSK decoded bitstream:");
-  ClearGraph(0);
-  for (i=0;i<size;++i){
-    GraphBuffer[i]=BitStream[i];
+  int size  = fskdemod(BitStream,BitLen,(uint8_t)rfLen,(uint8_t)invert,(uint8_t)fchigh,(uint8_t)fclow); 
+  if (size>0){
+    PrintAndLog("FSK decoded bitstream:");
+    ClearGraph(0);
+    for (i=0;i<size;++i){
+      GraphBuffer[i]=BitStream[i];
+    }
+    GraphTraceLen=size;
+    RepaintGraphWindow();
+    
+    // Now output the bitstream to the scrollback by line of 16 bits
+    if(size > (8*32)+2) size = (8*32)+2; //only output a max of 8 blocks of 32 bits  most tags will have full bit stream inside that sample size
+    printBitStream(BitStream,size);
+  } else{
+    PrintAndLog("no FSK data found");

   }
   }

-  GraphTraceLen=size;
-  RepaintGraphWindow();
-  
-  // Now output the bitstream to the scrollback by line of 16 bits
-  if(size > (8*32)+2) size = (8*32)+2; //only output a max of 8 blocks of 32 bits  most tags will have full bit stream inside that sample size
-  printBitStream(BitStream,size);

   return 0;
 }
 
   return 0;
 }
 


@@ -540,13 +565,16 @@ int CmdFSKdemodHID(const char *Cmd)
     PrintAndLog("Error demoding fsk");
     return 0;
   }
     PrintAndLog("Error demoding fsk");
     return 0;
   }

+  if (hi2==0 && hi==0 && lo==0) return 0;

   if (hi2 != 0){ //extra large HID tags
     PrintAndLog("TAG ID: %x%08x%08x (%d)",
        (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
   if (hi2 != 0){ //extra large HID tags
     PrintAndLog("TAG ID: %x%08x%08x (%d)",
        (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);

+    setGraphBuf(BitStream,BitLen);
+    return 1;

   }
   else {  //standard HID tags <38 bits
     //Dbprintf("TAG ID: %x%08x (%d)",(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF); //old print cmd
   }
   else {  //standard HID tags <38 bits
     //Dbprintf("TAG ID: %x%08x (%d)",(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF); //old print cmd

-    uint8_t bitlen = 0;
+    uint8_t fmtLen = 0;

     uint32_t fc = 0;
     uint32_t cardnum = 0;
     if (((hi>>5)&1)==1){//if bit 38 is set then < 37 bit format is used
     uint32_t fc = 0;
     uint32_t cardnum = 0;
     if (((hi>>5)&1)==1){//if bit 38 is set then < 37 bit format is used


@@ -557,39 +585,40 @@ int CmdFSKdemodHID(const char *Cmd)
         lo2=lo2>>1;
         idx3++;
       }
         lo2=lo2>>1;
         idx3++;
       }

-      bitlen =idx3+19;  
+      fmtLen =idx3+19;  

       fc =0;
       cardnum=0;
       fc =0;
       cardnum=0;

-      if(bitlen==26){
+      if(fmtLen==26){

         cardnum = (lo>>1)&0xFFFF;
         fc = (lo>>17)&0xFF;
       }
         cardnum = (lo>>1)&0xFFFF;
         fc = (lo>>17)&0xFF;
       }

-      if(bitlen==37){
+      if(fmtLen==37){

         cardnum = (lo>>1)&0x7FFFF;
         fc = ((hi&0xF)<<12)|(lo>>20);
       }
         cardnum = (lo>>1)&0x7FFFF;
         fc = ((hi&0xF)<<12)|(lo>>20);
       }

-      if(bitlen==34){
+      if(fmtLen==34){

         cardnum = (lo>>1)&0xFFFF;
         fc= ((hi&1)<<15)|(lo>>17);
       }
         cardnum = (lo>>1)&0xFFFF;
         fc= ((hi&1)<<15)|(lo>>17);
       }

-      if(bitlen==35){
+      if(fmtLen==35){

         cardnum = (lo>>1)&0xFFFFF;
         fc = ((hi&1)<<11)|(lo>>21);
       }
     }
     else { //if bit 38 is not set then 37 bit format is used
         cardnum = (lo>>1)&0xFFFFF;
         fc = ((hi&1)<<11)|(lo>>21);
       }
     }
     else { //if bit 38 is not set then 37 bit format is used

-      bitlen= 37;
+      fmtLen= 37;

       fc =0;
       cardnum=0;
       fc =0;
       cardnum=0;

-      if(bitlen==37){
+      if(fmtLen==37){

         cardnum = (lo>>1)&0x7FFFF;
         fc = ((hi&0xF)<<12)|(lo>>20);
       }
     }    
     PrintAndLog("TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
       (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF,
         cardnum = (lo>>1)&0x7FFFF;
         fc = ((hi&0xF)<<12)|(lo>>20);
       }
     }    
     PrintAndLog("TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
       (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF,

-      (unsigned int) bitlen, (unsigned int) fc, (unsigned int) cardnum);
-    return 0;
+      (unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum);
+    setGraphBuf(BitStream,BitLen);
+    return 1;

   }
   return 0;
 }
   }
   return 0;
 }


@@ -602,19 +631,22 @@ int CmdFSKdemodIO(const char *Cmd)
   //raw fsk demod no manchester decoding no start bit finding just get binary from wave
   //set defaults
   int idx=0; 
   //raw fsk demod no manchester decoding no start bit finding just get binary from wave
   //set defaults
   int idx=0; 

-  //test samples are not just noise
-  if (GraphTraceLen < 64) return 0;
+  //something in graphbuffer
+  if (GraphTraceLen < 65) return 0;

   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
   uint32_t BitLen = getFromGraphBuf(BitStream);
   //get binary from fsk wave
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
   uint32_t BitLen = getFromGraphBuf(BitStream);
   //get binary from fsk wave

+ // PrintAndLog("DEBUG: got buff");

   idx = IOdemodFSK(BitStream,BitLen); 
   if (idx<0){
   idx = IOdemodFSK(BitStream,BitLen); 
   if (idx<0){

-    PrintAndLog("Error demoding fsk");
+    //PrintAndLog("Error demoding fsk");

     return 0;
   }
     return 0;
   }

+ // PrintAndLog("DEBUG: Got IOdemodFSK");

   if (idx==0){
   if (idx==0){

-    PrintAndLog("IO Prox Data not found - FSK Data:");
-    printBitStream(BitStream,92);
+    //PrintAndLog("IO Prox Data not found - FSK Data:");
+    //if (BitLen > 92) printBitStream(BitStream,92);
+    return 0;

   }
     //Index map
     //0           10          20          30          40          50          60
   }
     //Index map
     //0           10          20          30          40          50          60


@@ -625,23 +657,24 @@ int CmdFSKdemodIO(const char *Cmd)
     //
     //XSF(version)facility:codeone+codetwo (raw)
     //Handle the data
     //
     //XSF(version)facility:codeone+codetwo (raw)
     //Handle the data

-        
+  if (idx+64>BitLen) return 0;

   PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx],    BitStream[idx+1],  BitStream[idx+2], BitStream[idx+3], BitStream[idx+4], BitStream[idx+5], BitStream[idx+6], BitStream[idx+7], BitStream[idx+8]);
   PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx+9],  BitStream[idx+10], BitStream[idx+11],BitStream[idx+12],BitStream[idx+13],BitStream[idx+14],BitStream[idx+15],BitStream[idx+16],BitStream[idx+17]);       
   PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx],    BitStream[idx+1],  BitStream[idx+2], BitStream[idx+3], BitStream[idx+4], BitStream[idx+5], BitStream[idx+6], BitStream[idx+7], BitStream[idx+8]);
   PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx+9],  BitStream[idx+10], BitStream[idx+11],BitStream[idx+12],BitStream[idx+13],BitStream[idx+14],BitStream[idx+15],BitStream[idx+16],BitStream[idx+17]);       

-  PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx+18], BitStream[idx+19], BitStream[idx+20],BitStream[idx+21],BitStream[idx+22],BitStream[idx+23],BitStream[idx+24],BitStream[idx+25],BitStream[idx+26]);
-  PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx+27], BitStream[idx+28], BitStream[idx+29],BitStream[idx+30],BitStream[idx+31],BitStream[idx+32],BitStream[idx+33],BitStream[idx+34],BitStream[idx+35]);
-  PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx+36], BitStream[idx+37], BitStream[idx+38],BitStream[idx+39],BitStream[idx+40],BitStream[idx+41],BitStream[idx+42],BitStream[idx+43],BitStream[idx+44]);
-  PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx+45], BitStream[idx+46], BitStream[idx+47],BitStream[idx+48],BitStream[idx+49],BitStream[idx+50],BitStream[idx+51],BitStream[idx+52],BitStream[idx+53]);
-  PrintAndLog("%d%d%d%d%d%d%d%d %d%d",BitStream[idx+54],BitStream[idx+55],BitStream[idx+56],BitStream[idx+57],BitStream[idx+58],BitStream[idx+59],BitStream[idx+60],BitStream[idx+61],BitStream[idx+62],BitStream[idx+63]);
+  PrintAndLog("%d%d%d%d%d%d%d%d %d facility",BitStream[idx+18], BitStream[idx+19], BitStream[idx+20],BitStream[idx+21],BitStream[idx+22],BitStream[idx+23],BitStream[idx+24],BitStream[idx+25],BitStream[idx+26]);
+  PrintAndLog("%d%d%d%d%d%d%d%d %d version",BitStream[idx+27], BitStream[idx+28], BitStream[idx+29],BitStream[idx+30],BitStream[idx+31],BitStream[idx+32],BitStream[idx+33],BitStream[idx+34],BitStream[idx+35]);
+  PrintAndLog("%d%d%d%d%d%d%d%d %d code1",BitStream[idx+36], BitStream[idx+37], BitStream[idx+38],BitStream[idx+39],BitStream[idx+40],BitStream[idx+41],BitStream[idx+42],BitStream[idx+43],BitStream[idx+44]);
+  PrintAndLog("%d%d%d%d%d%d%d%d %d code2",BitStream[idx+45], BitStream[idx+46], BitStream[idx+47],BitStream[idx+48],BitStream[idx+49],BitStream[idx+50],BitStream[idx+51],BitStream[idx+52],BitStream[idx+53]);
+  PrintAndLog("%d%d%d%d%d%d%d%d %d%d checksum",BitStream[idx+54],BitStream[idx+55],BitStream[idx+56],BitStream[idx+57],BitStream[idx+58],BitStream[idx+59],BitStream[idx+60],BitStream[idx+61],BitStream[idx+62],BitStream[idx+63]);

 
   uint32_t code = bytebits_to_byte(BitStream+idx,32);
   uint32_t code2 = bytebits_to_byte(BitStream+idx+32,32); 
 
   uint32_t code = bytebits_to_byte(BitStream+idx,32);
   uint32_t code2 = bytebits_to_byte(BitStream+idx+32,32); 

-  short version = bytebits_to_byte(BitStream+idx+27,8); //14,4
-  uint8_t facilitycode = bytebits_to_byte(BitStream+idx+19,8) ;
+  uint8_t version = bytebits_to_byte(BitStream+idx+27,8); //14,4
+  uint8_t facilitycode = bytebits_to_byte(BitStream+idx+18,8) ;

   uint16_t number = (bytebits_to_byte(BitStream+idx+36,8)<<8)|(bytebits_to_byte(BitStream+idx+45,8)); //36,9
   
   uint16_t number = (bytebits_to_byte(BitStream+idx+36,8)<<8)|(bytebits_to_byte(BitStream+idx+45,8)); //36,9
   

-  PrintAndLog("XSF(%02d)%02x:%d (%08x%08x)",version,facilitycode,number,code,code2);    
-  return 0;
+  PrintAndLog("XSF(%02d)%02x:%05d (%08x%08x)",version,facilitycode,number,code,code2);    
+  setGraphBuf(BitStream,BitLen);
+  return 1;

 }
 int CmdFSKdemod(const char *Cmd) //old CmdFSKdemod needs updating
 {
 }
 int CmdFSKdemod(const char *Cmd) //old CmdFSKdemod needs updating
 {


@@ -663,7 +696,7 @@ int CmdFSKdemod(const char *Cmd) //old CmdFSKdemod needs updating
 
   int lowLen = sizeof (LowTone) / sizeof (int);
   int highLen = sizeof (HighTone) / sizeof (int);
 
   int lowLen = sizeof (LowTone) / sizeof (int);
   int highLen = sizeof (HighTone) / sizeof (int);

-  int convLen = (highLen > lowLen) ? highLen : lowLen; //if highlen > lowLen then highlen else lowlen
+  int convLen = (highLen > lowLen) ? highLen : lowLen;

   uint32_t hi = 0, lo = 0;
 
   int i, j;
   uint32_t hi = 0, lo = 0;
 
   int i, j;


@@ -729,8 +762,7 @@ int CmdFSKdemod(const char *Cmd) //old CmdFSKdemod needs updating
   PrintAndLog("actual data bits start at sample %d", maxPos);
   PrintAndLog("length %d/%d", highLen, lowLen);
 
   PrintAndLog("actual data bits start at sample %d", maxPos);
   PrintAndLog("length %d/%d", highLen, lowLen);
 

-  uint8_t bits[46];
-  bits[sizeof(bits)-1] = '\0';
+  uint8_t bits[46] = {0x00};

 
   // find bit pairs and manchester decode them
   for (i = 0; i < arraylen(bits) - 1; ++i) {
 
   // find bit pairs and manchester decode them
   for (i = 0; i < arraylen(bits) - 1; ++i) {


@@ -837,22 +869,21 @@ int CmdHpf(const char *Cmd)
 
 int CmdSamples(const char *Cmd)
 {
 
 int CmdSamples(const char *Cmd)
 {

-  int cnt = 0;
-  int n;
-  uint8_t got[40000];
-
-  n = strtol(Cmd, NULL, 0);
-  if (n == 0) n = 6000;
-  if (n > sizeof(got)) n = sizeof(got);
+       uint8_t got[40000] = {0x00};
+
+       int n = strtol(Cmd, NULL, 0);
+       if (n == 0) 
+               n = 20000;
+               
+       if (n > sizeof(got)) 
+               n = sizeof(got);

   
   

-  PrintAndLog("Reading %d samples\n", n);
+       PrintAndLog("Reading %d samples from device memory\n", n);

   GetFromBigBuf(got,n,0);
   WaitForResponse(CMD_ACK,NULL);
   GetFromBigBuf(got,n,0);
   WaitForResponse(CMD_ACK,NULL);

-  for (int j = 0; j < n; j++) {
-    GraphBuffer[cnt++] = ((int)got[j]) - 128;
+       for (int j = 0; j < n; ++j) {
+               GraphBuffer[j] = ((int)got[j]) - 128;

   }
   }

-  
-  PrintAndLog("Done!\n");

   GraphTraceLen = n;
   RepaintGraphWindow();
   return 0;
   GraphTraceLen = n;
   RepaintGraphWindow();
   return 0;


@@ -899,22 +930,28 @@ int CmdTuneSamples(const char *Cmd)
 
        for (int i = 0; i < 256; i++) {
                GraphBuffer[i] = resp.d.asBytes[i] - 128;
 
        for (int i = 0; i < 256; i++) {
                GraphBuffer[i] = resp.d.asBytes[i] - 128;

-       }
+  }

   
   

-       PrintAndLog("Done! Divisor 89 is 134khz, 95 is 125khz.\n");
-       PrintAndLog("\n");
+  PrintAndLog("Done! Divisor 89 is 134khz, 95 is 125khz.\n");
+  PrintAndLog("\n");

        GraphTraceLen = 256;
        ShowGraphWindow();
 
        GraphTraceLen = 256;
        ShowGraphWindow();
 

-       return 0;
+  return 0;

 }
 
 }
 

-

 int CmdLoad(const char *Cmd)
 {
 int CmdLoad(const char *Cmd)
 {

-  FILE *f = fopen(Cmd, "r");
+   char filename[FILE_PATH_SIZE] = {0x00};
+   int len = 0;
+
+   len = strlen(Cmd);
+   if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+   memcpy(filename, Cmd, len);
+       
+   FILE *f = fopen(filename, "r");

   if (!f) {
   if (!f) {

-    PrintAndLog("couldn't open '%s'", Cmd);
+     PrintAndLog("couldn't open '%s'", filename);

     return 0;
   }
 
     return 0;
   }
 


@@ -941,6 +978,15 @@ int CmdLtrim(const char *Cmd)
   RepaintGraphWindow();
   return 0;
 }
   RepaintGraphWindow();
   return 0;
 }

+int CmdRtrim(const char *Cmd)
+{
+  int ds = atoi(Cmd);
+
+  GraphTraceLen = ds;
+
+  RepaintGraphWindow();
+  return 0;
+}

 
 /*
  * Manchester demodulate a bitstream. The bitstream needs to be already in
 
 /*
  * Manchester demodulate a bitstream. The bitstream needs to be already in


@@ -1211,9 +1257,17 @@ int CmdPlot(const char *Cmd)
 
 int CmdSave(const char *Cmd)
 {
 
 int CmdSave(const char *Cmd)
 {

-  FILE *f = fopen(Cmd, "w");
+   char filename[FILE_PATH_SIZE] = {0x00};
+   int len = 0;
+
+   len = strlen(Cmd);
+   if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
+   memcpy(filename, Cmd, len);
+   
+
+  FILE *f = fopen(filename, "w");

   if(!f) {
   if(!f) {

-    PrintAndLog("couldn't open '%s'", Cmd);
+    PrintAndLog("couldn't open '%s'", filename);

     return 0;
   }
   int i;
     return 0;
   }
   int i;


@@ -1319,24 +1373,26 @@ static command_t CommandTable[] =
   {"help",          CmdHelp,            1, "This help"},
   {"amp",           CmdAmp,             1, "Amplify peaks"},
   {"askdemod",      Cmdaskdemod,        1, "<0 or 1> -- Attempt to demodulate simple ASK tags"},
   {"help",          CmdHelp,            1, "This help"},
   {"amp",           CmdAmp,             1, "Amplify peaks"},
   {"askdemod",      Cmdaskdemod,        1, "<0 or 1> -- Attempt to demodulate simple ASK tags"},

-  {"askmandemod",   Cmdaskmandemod,     1, "[clock] [invert<0 or 1>] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional[clock will try Auto-detect])"},
-  {"askrawdemod",   Cmdaskrawdemod,     1, "[clock] [invert<0 or 1>] -- Attempt to demodulate ASK tags and output binary (args optional[clock will try Auto-detect])"},
+  {"askmandemod",   Cmdaskmandemod,     1, "[clock] [invert <0|1>] -- Attempt to demodulate ASK/Manchester tags and output binary"},
+  {"askrawdemod",   Cmdaskrawdemod,     1, "[clock] [invert <0|1>] -- Attempt to demodulate ASK tags and output binary"},

   {"autocorr",      CmdAutoCorr,        1, "<window length> -- Autocorrelation over window"},
   {"autocorr",      CmdAutoCorr,        1, "<window length> -- Autocorrelation over window"},

+  {"biphaserawdecode",CmdBiphaseDecodeRaw,1,"[offset] Biphase decode binary stream already in graph buffer (offset = bit to start decode from)"},

   {"bitsamples",    CmdBitsamples,      0, "Get raw samples as bitstring"},
   {"bitstream",     CmdBitstream,       1, "[clock rate] -- Convert waveform into a bitstream"},
   {"buffclear",     CmdBuffClear,       1, "Clear sample buffer and graph window"},
   {"dec",           CmdDec,             1, "Decimate samples"},
   {"bitsamples",    CmdBitsamples,      0, "Get raw samples as bitstring"},
   {"bitstream",     CmdBitstream,       1, "[clock rate] -- Convert waveform into a bitstream"},
   {"buffclear",     CmdBuffClear,       1, "Clear sample buffer and graph window"},
   {"dec",           CmdDec,             1, "Decimate samples"},

-  {"detectclock",   CmdDetectClockRate, 1, "Detect clock rate"},
+  {"detectaskclock",CmdDetectClockRate, 1, "Detect ASK clock rate"},

   {"fskdemod",      CmdFSKdemod,        1, "Demodulate graph window as a HID FSK"},
   {"fskhiddemod",   CmdFSKdemodHID,     1, "Demodulate graph window as a HID FSK using raw"},
   {"fskiodemod",    CmdFSKdemodIO,      1, "Demodulate graph window as an IO Prox FSK using raw"},
   {"fskdemod",      CmdFSKdemod,        1, "Demodulate graph window as a HID FSK"},
   {"fskhiddemod",   CmdFSKdemodHID,     1, "Demodulate graph window as a HID FSK using raw"},
   {"fskiodemod",    CmdFSKdemodIO,      1, "Demodulate graph window as an IO Prox FSK using raw"},

-  {"fskrawdemod",   CmdFSKrawdemod,     1, "[clock rate] [invert] Demodulate graph window from FSK to binary (clock = 64 or 50)(invert = 1 or 0)"},
+  {"fskrawdemod",   CmdFSKrawdemod,     1, "[clock rate] [invert] [rchigh] [rclow] Demodulate graph window from FSK to binary (clock = 50)(invert = 1 or 0)(rchigh = 10)(rclow=8)"},

   {"grid",          CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
   {"hexsamples",    CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},  
   {"hide",          CmdHide,            1, "Hide graph window"},
   {"hpf",           CmdHpf,             1, "Remove DC offset from trace"},
   {"load",          CmdLoad,            1, "<filename> -- Load trace (to graph window"},
   {"ltrim",         CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
   {"grid",          CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
   {"hexsamples",    CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},  
   {"hide",          CmdHide,            1, "Hide graph window"},
   {"hpf",           CmdHpf,             1, "Remove DC offset from trace"},
   {"load",          CmdLoad,            1, "<filename> -- Load trace (to graph window"},
   {"ltrim",         CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},

+  {"rtrim",         CmdRtrim,           1, "<location to end trace> -- Trim samples from right of trace"},

   {"mandemod",      CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},
   {"manrawdecode",  Cmdmandecoderaw,    1, "Manchester decode binary stream already in graph buffer"},
   {"manmod",        CmdManchesterMod,   1, "[clock rate] -- Manchester modulate a binary stream"},
   {"mandemod",      CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},
   {"manrawdecode",  Cmdmandecoderaw,    1, "Manchester decode binary stream already in graph buffer"},
   {"manmod",        CmdManchesterMod,   1, "[clock rate] -- Manchester modulate a binary stream"},