FIX: @pwpiwi 's fixes for darkside / nested attack about the NACK/PRNG bugs.

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index ebab14396f28f456ef128dafeb3b0ffa06b93552..4eca030db416480829f45852e30df8ebccfbfd74 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -1556,12 +1556,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