CHG: Updated the CHANGELOG.md

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 9b8933289dbf57035a576365684db30a76d4a367..311e5b3215a681da3d792cef00dff399a6c4acd6 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -619,13 +619,13 @@ int CmdG_Prox_II_Demod(const char *Cmd)
                        continue;
                } 
                if (keyCnt<8){ //lsb first
-                       xorKey = xorKey | (DemodBuffer[startIdx+idx]<<keyCnt);
+                       xorKey |=  (DemodBuffer[startIdx+idx]<<keyCnt);
                        keyCnt++;
                        if (keyCnt==8 && g_debugMode) PrintAndLog("xorKey Found: %02x", xorKey);
                        continue;
                }
                //lsb first
-               ByteStream[ByteCnt] = ByteStream[ByteCnt] | (DemodBuffer[startIdx+idx]<<bitCnt);
+               ByteStream[ByteCnt] |=  (DemodBuffer[startIdx+idx]<<bitCnt);
                bitCnt++;
                if (bitCnt % 8 == 0){
                        if (g_debugMode) PrintAndLog("byte %u: %02x", (unsigned int)ByteCnt, ByteStream[ByteCnt]);
@@ -1483,10 +1483,7 @@ int CmdFSKdemodPyramid(const char *Cmd)
                PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, rawHi3, rawHi2, rawHi, rawLo);
        } else {
                cardnum = bytebits_to_byte(BitStream+81, 16);
-               if (fmtLen > 32)
-                       PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-               else
-                       PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
+               PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
        }
        if (checksum == checkCS)
                PrintAndLog("Checksum %02x passed", checksum);