@frederikmoellers EPA changes, with APDU for ISO14443b support

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index ebab14396f28f456ef128dafeb3b0ffa06b93552..f3644304bc8a62388698fdeb9d8a5a128f370d40 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -26,8 +26,8 @@
 #include "crc16.h"
 
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 #include "crc16.h"
 
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];

-uint8_t g_debugMode;
-size_t DemodBufferLen;
+uint8_t g_debugMode=0;
+size_t DemodBufferLen=0;

 static int CmdHelp(const char *Cmd);
 
 //set the demod buffer with given array of binary (one bit per byte)
 static int CmdHelp(const char *Cmd);
 
 //set the demod buffer with given array of binary (one bit per byte)


@@ -503,6 +503,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
        
        uint8_t BitStream[MAX_DEMOD_BUF_LEN];
        size_t size = getFromGraphBuf(BitStream);         
        
        uint8_t BitStream[MAX_DEMOD_BUF_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);  
        if ( errCnt < 0 || errCnt > maxErr ) {   
                if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);  
        int errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);  
        if ( errCnt < 0 || errCnt > maxErr ) {   
                if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);  


@@ -1501,9 +1502,9 @@ int CmdFDXBdemodBI(const char *Cmd){
        
        setDemodBuf(BitStream, 128, preambleIndex);
 
        
        setDemodBuf(BitStream, 128, preambleIndex);
 

-       // remove but don't verify parity. (pType = 2)
+       // remove marker bits (1's every 9th digit after preamble) (pType = 2)

        size = removeParity(BitStream, preambleIndex + 11, 9, 2, 117);
        size = removeParity(BitStream, preambleIndex + 11, 9, 2, 117);

-       if ( size <= 103 ) {
+       if ( size != 104 ) {

                if (g_debugMode) PrintAndLog("Error removeParity:: %d", size);
                return 0;
        }
                if (g_debugMode) PrintAndLog("Error removeParity:: %d", size);
                return 0;
        }


@@ -1556,12 +1557,12 @@ int PSKDemod(const char *Cmd, bool verbose)
                clk=0;
        }
        if (invert != 0 && invert != 1) {
                clk=0;
        }
        if (invert != 0 && invert != 1) {

-               if (verbose) PrintAndLog("Invalid argument: %s", Cmd);
+               if (g_debugMode || verbose) PrintAndLog("Invalid argument: %s", Cmd);

                return 0;
        }
        uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
        size_t BitLen = getFromGraphBuf(BitStream);
                return 0;
        }
        uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
        size_t BitLen = getFromGraphBuf(BitStream);

-       if (BitLen==0) return -1;
+       if (BitLen==0) return 0;

        uint8_t carrier=countFC(BitStream, BitLen, 0);
        if (carrier!=2 && carrier!=4 && carrier!=8){
                //invalid carrier
        uint8_t carrier=countFC(BitStream, BitLen, 0);
        if (carrier!=2 && carrier!=4 && carrier!=8){
                //invalid carrier