fix buffer length bugs

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index ef1229c267757ec965ba79680b1257c66a07c3a5..8f2aea5aa75c068fe9d4675f56434333f71e2f24 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -22,8 +22,6 @@
 #include "cmdparser.h"// already included in cmdmain.h
 #include "usb_cmd.h"  // already included in cmdmain.h and proxmark3.h
 #include "lfdemod.h"  // for demod code
-#include "crc.h"      // for pyramid checksum maxim
-#include "crc16.h"    // for FDXB demod checksum
 #include "loclass/cipherutils.h" // for decimating samples in getsamples
 #include "cmdlfem4x.h"// for em410x demod
 
@@ -42,7 +40,7 @@ void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
        if (buff == NULL) 
                return;
 
-       if ( size >= MAX_DEMOD_BUF_LEN)
+       if ( size + startIdx >= MAX_DEMOD_BUF_LEN)
                size = MAX_DEMOD_BUF_LEN;
 
        size_t i = 0;
@@ -53,6 +51,36 @@ void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
        return;
 }
 
+bool getDemodBuf(uint8_t *buff, size_t *size) {
+       if (buff == NULL) return false;
+       if (size == NULL) return false;
+       if (*size == 0) return false;
+
+       *size = (*size > DemodBufferLen) ? DemodBufferLen : *size;
+
+       memcpy(buff, DemodBuffer, *size);
+       return true;
+}
+
+// option '1' to save DemodBuffer any other to restore
+void save_restoreDB(uint8_t saveOpt)
+{
+       static uint8_t SavedDB[MAX_DEMOD_BUF_LEN];
+       static size_t SavedDBlen;
+       static bool DB_Saved = false;
+
+       if (saveOpt==1) { //save
+
+               memcpy(SavedDB, DemodBuffer, sizeof(DemodBuffer));
+               SavedDBlen = DemodBufferLen;
+               DB_Saved=true;
+       } else if (DB_Saved) { //restore
+               memcpy(DemodBuffer, SavedDB, sizeof(DemodBuffer));
+               DemodBufferLen = SavedDBlen;
+       }
+       return;
+}
+
 int CmdSetDebugMode(const char *Cmd)
 {
        int demod=0;
@@ -196,12 +224,17 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
        bool st = false;
        size_t ststart = 0, stend = 0;
        if (*stCheck) st = DetectST_ext(BitStream, &BitLen, &foundclk, &ststart, &stend);
+       *stCheck = st;
        if (st) {
-               *stCheck = st;
                clk = (clk == 0) ? foundclk : clk;
                CursorCPos = ststart;
                CursorDPos = stend;
                if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator - First one is shown by orange and blue graph markers");
+               //Graph ST trim (for testing)
+               //for (int i = 0; i < BitLen; i++) {
+               //      GraphBuffer[i] = BitStream[i]-128;
+               //}
+               //RepaintGraphWindow();
        }
        int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askamp, askType);
        if (errCnt<0 || BitLen<16){  //if fatal error (or -1)
@@ -290,7 +323,7 @@ int Cmdmandecoderaw(const char *Cmd)
                return 0;
        }
        if (DemodBufferLen==0) return 0;
-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+       uint8_t BitStream[MAX_DEMOD_BUF_LEN]={0};
        int high=0,low=0;
        for (;i<DemodBufferLen;++i){
                if (DemodBuffer[i]>high) high=DemodBuffer[i];
@@ -352,13 +385,13 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
                return 0;
        }
        sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
-       if (DemodBufferLen==0){
+       if (DemodBufferLen==0) {
                PrintAndLog("DemodBuffer Empty - run 'data rawdemod ar' first");
                return 0;
        }
-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       memcpy(BitStream, DemodBuffer, DemodBufferLen); 
-       size = DemodBufferLen;
+       uint8_t BitStream[MAX_DEMOD_BUF_LEN]={0};
+       size = sizeof(BitStream);
+       if ( !getDemodBuf(BitStream, &size) ) return 0;
        errCnt=BiphaseRawDecode(BitStream, &size, offset, invert);
        if (errCnt<0){
                PrintAndLog("Error during decode:%d", errCnt);
@@ -387,7 +420,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
        int offset=0, clk=0, invert=0, maxErr=0;
        sscanf(Cmd, "%i %i %i %i", &offset, &clk, &invert, &maxErr);
 
-       uint8_t BitStream[MAX_DEMOD_BUF_LEN];     
+       uint8_t BitStream[MAX_GRAPH_TRACE_LEN];   
        size_t size = getFromGraphBuf(BitStream);         
        //invert here inverts the ask raw demoded bits which has no effect on the demod, but we need the pointer
        int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);  
@@ -820,14 +853,6 @@ int PSKDemod(const char *Cmd, bool verbose)
        uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
        size_t BitLen = getFromGraphBuf(BitStream);
        if (BitLen==0) return 0;
-       uint8_t carrier=countFC(BitStream, BitLen, 0);
-       if (carrier!=2 && carrier!=4 && carrier!=8){
-               //invalid carrier
-               return 0;
-       }
-       if (g_debugMode){
-               PrintAndLog("Carrier: rf/%d",carrier);
-       }
        int errCnt=0;
        errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
        if (errCnt > maxErr){
@@ -1113,7 +1138,7 @@ uint8_t getByte(uint8_t bits_per_sample, BitstreamIn* b)
        return val;
 }
 
-int getSamples(const char *Cmd, bool silent)
+int getSamples(int n, bool silent)
 {
        //If we get all but the last byte in bigbuf,
        // we don't have to worry about remaining trash
@@ -1122,14 +1147,12 @@ int getSamples(const char *Cmd, bool silent)
 
        uint8_t got[BIGBUF_SIZE-1] = { 0 };
 
-       int n = strtol(Cmd, NULL, 0);
-
        if (n == 0 || n > sizeof(got))
                n = sizeof(got);
 
-       PrintAndLog("Reading %d bytes from device memory\n", n);
+       if (!silent) PrintAndLog("Reading %d bytes from device memory\n", n);
        GetFromBigBuf(got,n,0);
-       PrintAndLog("Data fetched");
+       if (!silent) PrintAndLog("Data fetched");
        UsbCommand response;
        WaitForResponse(CMD_ACK, &response);
        uint8_t bits_per_sample = 8;
@@ -1144,7 +1167,7 @@ int getSamples(const char *Cmd, bool silent)
        }
        if(bits_per_sample < 8)
        {
-               PrintAndLog("Unpacking...");
+               if (!silent) PrintAndLog("Unpacking...");
                BitstreamIn bout = { got, bits_per_sample * n,  0};
                int j =0;
                for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
@@ -1167,7 +1190,8 @@ int getSamples(const char *Cmd, bool silent)
 
 int CmdSamples(const char *Cmd)
 {
-       return getSamples(Cmd, false);
+       int n = strtol(Cmd, NULL, 0);
+       return getSamples(n, false);
 }
 
 int CmdTuneSamples(const char *Cmd)
@@ -1298,9 +1322,9 @@ int CmdMtrim(const char *Cmd) {
        if (start > GraphTraceLen       || stop > GraphTraceLen || start > stop) return 0;
        start++; //leave start position sample
 
-       GraphTraceLen -= stop - start;
+       GraphTraceLen = stop - start;
        for (int i = 0; i < GraphTraceLen; i++) {
-               GraphBuffer[start+i] = GraphBuffer[stop+i];
+               GraphBuffer[i] = GraphBuffer[start+i];
        }
        return 0;
 }