CHG: Updated the CHANGELOG.md

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index d1a685e64be139484d87ba6f6a35b2ef192323ce..311e5b3215a681da3d792cef00dff399a6c4acd6 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -613,29 +613,29 @@ int CmdG_Prox_II_Demod(const char *Cmd)
                if ((idx+1) % 5 == 0){
                        //spacer bit - should be 0
                        if (DemodBuffer[startIdx+idx] != 0) {
-                               if (g_debugMode) PrintAndLog("Error spacer not 0: %d, pos: %d",DemodBuffer[startIdx+idx],startIdx+idx);
+                               if (g_debugMode) PrintAndLog("Error spacer not 0: %u, pos: %u", (unsigned int)DemodBuffer[startIdx+idx],(unsigned int)(startIdx+idx));
                                return 0;
                        }
                        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 %d: %02x",ByteCnt,ByteStream[ByteCnt]);
+                       if (g_debugMode) PrintAndLog("byte %u: %02x", (unsigned int)ByteCnt, ByteStream[ByteCnt]);
                        bitCnt=0;
                        ByteCnt++;
                }
        }
        for (uint8_t i = 0; i < ByteCnt; i++){
                ByteStream[i] ^= xorKey; //xor
-               if (g_debugMode) PrintAndLog("byte %d after xor: %02x", i, ByteStream[i]);
+               if (g_debugMode) PrintAndLog("byte %u after xor: %02x", (unsigned int)i, ByteStream[i]);
        }
        //now ByteStream contains 64 bytes of decrypted raw tag data
        // 
@@ -1410,7 +1410,7 @@ int CmdFSKdemodPyramid(const char *Cmd)
        // s = format start bit, o = odd parity of last 7 bits
        // f = facility code, c = card number
        // w = wiegand parity, x = extra space for other formats
-       // p = unknown checksum
+       // p = CRC8maxim checksum
        // (26 bit format shown)
 
        //get bytes for checksum calc
@@ -1457,38 +1457,33 @@ int CmdFSKdemodPyramid(const char *Cmd)
        // s = format start bit, o = odd parity of last 7 bits
        // f = facility code, c = card number
        // w = wiegand parity, x = extra space for other formats
-       // p = unknown checksum
+       // p = CRC8-Maxim checksum
        // (26 bit format shown)
 
        //find start bit to get fmtLen
        int j;
-       for (j=0; j<size; j++){
+       for (j=0; j < size; ++j){
                if(BitStream[j]) break;
        }
+       
        uint8_t fmtLen = size-j-8;
        uint32_t fc = 0;
        uint32_t cardnum = 0;
        uint32_t code1 = 0;
-       if (fmtLen==26){
+       
+       if ( fmtLen == 26 ){
                fc = bytebits_to_byte(BitStream+73, 8);
                cardnum = bytebits_to_byte(BitStream+81, 16);
                code1 = bytebits_to_byte(BitStream+72,fmtLen);
                PrintAndLog("Pyramid ID Found - BitLength: %d, FC: %d, Card: %d - Wiegand: %x, Raw: %08x%08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi3, rawHi2, rawHi, rawLo);
-       } else if (fmtLen==45){
-               fmtLen=42; //end = 10 bits not 7 like 26 bit fmt
+       } else if (fmtLen == 45) {
+               fmtLen = 42; //end = 10 bits not 7 like 26 bit fmt
                fc = bytebits_to_byte(BitStream+53, 10);
                cardnum = bytebits_to_byte(BitStream+63, 32);
                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){
-                       //code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen-32);
-                       //code2 = bytebits_to_byte(BitStream+(size-32),32);
-                       PrintAndLog("Pyramid ID Found - BitLength: %d -unknown BitLength- (%d), Raw: %08x%08x%08x%08x", fmtLen, cardnum, rawHi3, rawHi2, rawHi, rawLo);
-               } else{
-                       //code1 = bytebits_to_byte(BitStream+(size-fmtLen),fmtLen);
-                       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);