CHG: some calyspo stuff

[proxmark3-svn] / client / cmdlfhid.c

diff --git a/client/cmdlfhid.c b/client/cmdlfhid.c
index f17bb58c96610f38718eaf8d090cf9149a74d8a8..fd0f6eba137572b7d25b38d835eccdaf2206daf1 100644 (file)
--- a/client/cmdlfhid.c
+++ b/client/cmdlfhid.c
@@ -319,7 +319,8 @@ int CmdHIDWiegand(const char *Cmd) {
        uint32_t oem = 0, fc = 0;
        uint64_t cardnum = 0;
        
        uint32_t oem = 0, fc = 0;
        uint64_t cardnum = 0;
        

-       uint32_t blocks[2], wiegand[2];
+       uint32_t blocks[2] = {0,0};
+       uint32_t wiegand[2] = {0,0}; 

 
        uint8_t bits[96];
        uint8_t *bs = bits;
 
        uint8_t bits[96];
        uint8_t *bs = bits;


@@ -335,14 +336,15 @@ int CmdHIDWiegand(const char *Cmd) {
        // 
        uint8_t ftmlen[] = {26,33,34,35,37,38,40};
        
        // 
        uint8_t ftmlen[] = {26,33,34,35,37,38,40};
        

-       PrintAndLog("HID | FC  | CN    |  Wiegand  |  HID Formatted");
-       PrintAndLog("----+-----+-------+-----------+--------------------");
+       PrintAndLog("HID | OEM |  FC |   CN  |  Wiegand  |  HID Formatted");
+       PrintAndLog("----+-----+-----+-------+-----------+--------------------");

        for (uint8_t i = 0; i < sizeof(ftmlen); i++){
                calcWiegand( ftmlen[i], fc, cardnum, bs);
                blocks[0] = bytebits_to_byte(bs,32);
                blocks[1] = bytebits_to_byte(bs+32,32);
        for (uint8_t i = 0; i < sizeof(ftmlen); i++){
                calcWiegand( ftmlen[i], fc, cardnum, bs);
                blocks[0] = bytebits_to_byte(bs,32);
                blocks[1] = bytebits_to_byte(bs+32,32);

-               PrintAndLog(" %d | %d  | %llu  | %08X%08X  |  %08X%08X ",
+               PrintAndLog(" %d | %d  | %d  | %llu  | %08X%08X  |  %08X%08X ",

                        ftmlen,
                        ftmlen,

+                       oem,

                        fc,
                        cardnum,
                        wiegand[0],
                        fc,
                        cardnum,
                        wiegand[0],


@@ -351,7 +353,7 @@ int CmdHIDWiegand(const char *Cmd) {
                        blocks[1]
                        );
        }
                        blocks[1]
                        );
        }

-       PrintAndLog("----+-----+-------+-----------+--------------------");
+       PrintAndLog("----+-----+-----+-------+-----------+--------------------");

        return 0;
 }
 
        return 0;
 }