chg: minor changes to text, explaining current implementation for "lf pyramid clone...

[proxmark3-svn] / client / cmdlfpyramid.c

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index c1c237299f8f98b256e84c72a92283a1ab135af1..d1b8f6b8475c5699f71a9aa78c6690d9317bf20d 100644 (file)
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -12,8 +12,9 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_pyramid_clone(void){
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_pyramid_clone(void){

-       PrintAndLog("clone a Farepointe/Pyramid tag to a T55x7 tag.");
-       PrintAndLog("Per pyramid format, the facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
+       PrintAndLog("clone a Farpointe/Pyramid tag to a T55x7 tag.");
+       PrintAndLog("The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated. ");
+       PrintAndLog("Currently work only on 26bit");

        PrintAndLog("");
        PrintAndLog("Usage: lf pyramid clone <Facility-Code> <Card-Number>");
        PrintAndLog("Options :");
        PrintAndLog("");
        PrintAndLog("Usage: lf pyramid clone <Facility-Code> <Card-Number>");
        PrintAndLog("Options :");


@@ -25,9 +26,10 @@ int usage_lf_pyramid_clone(void){
 }
 
 int usage_lf_pyramid_sim(void) {
 }
 
 int usage_lf_pyramid_sim(void) {

-       PrintAndLog("Enables simulation of Farepointe/Pyramid card with specified card number.");
+       PrintAndLog("Enables simulation of Farpointe/Pyramid card with specified card number.");

        PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");
        PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");

-       PrintAndLog("Per pyramid format, the facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
+       PrintAndLog("The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
+       PrintAndLog("Currently work only on 26bit");

        PrintAndLog("");
        PrintAndLog("Usage:  lf pyramid sim <Card-Number>");
        PrintAndLog("Options :");
        PrintAndLog("");
        PrintAndLog("Usage:  lf pyramid sim <Card-Number>");
        PrintAndLog("Options :");


@@ -38,26 +40,25 @@ int usage_lf_pyramid_sim(void) {
        return 0;
 }
 
        return 0;
 }
 

-// calc checksum
-int GetWiegandFromPyramid(const char *id, uint32_t *fc, uint32_t *cn) {
-       return 0;
-}

 
 

+// Works for 26bits.

 int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
        uint8_t pre[128];
        memset(pre, 0x00, sizeof(pre));
 
        // format start bit
 int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
        uint8_t pre[128];
        memset(pre, 0x00, sizeof(pre));
 
        // format start bit

+       pre[79] = 1;

        
        // Get 26 wiegand from FacilityCode, CardNumber 
        
        // Get 26 wiegand from FacilityCode, CardNumber 

-       uint8_t wiegand[26];
+       uint8_t wiegand[24];
+       memset(wiegand, 0x00, sizeof(wiegand));

        num_to_bytebits(fc, 8, wiegand);
        num_to_bytebits(cn, 16, wiegand+8);
 
        // add wiegand parity bits (dest, source, len)
        num_to_bytebits(fc, 8, wiegand);
        num_to_bytebits(cn, 16, wiegand+8);
 
        // add wiegand parity bits (dest, source, len)

-       wiegand_add_parity(pre+71, wiegand, 26);
-
+       wiegand_add_parity(pre+80, wiegand, 24);
+       

        // add paritybits       (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
        addParity(pre+8, pyramidBits+8, 112, 8, 1);
        
        // add paritybits       (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
        addParity(pre+8, pyramidBits+8, 112, 8, 1);
        


@@ -68,21 +69,13 @@ int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
        uint32_t crc = CRC8Maxim(csBuff, 13);
        num_to_bytebits(crc, 8, pyramidBits+120);
 
        uint32_t crc = CRC8Maxim(csBuff, 13);
        num_to_bytebits(crc, 8, pyramidBits+120);

+

        return 1;
 }
        return 1;
 }

-/*
-9     - 00001001
-33278 -         1000000111111110
-               10000100110000001
-000101010101010101010101082602

 
 

-*/

 int CmdPyramidRead(const char *Cmd) {
 int CmdPyramidRead(const char *Cmd) {

-       // read lf silently

        CmdLFRead("s");
        CmdLFRead("s");

-       // get samples silently

        getSamples("30000",false);
        getSamples("30000",false);

-       // demod and output Pyramid ID  

        return CmdFSKdemodPyramid("");
 }
 
        return CmdFSKdemodPyramid("");
 }
 


@@ -92,10 +85,9 @@ int CmdPyramidClone(const char *Cmd) {
        if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_clone();
 
        uint32_t facilitycode=0, cardnumber=0, fc = 0, cn = 0;
        if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_clone();
 
        uint32_t facilitycode=0, cardnumber=0, fc = 0, cn = 0;

-       
-       uint8_t bits[128];
-       uint8_t *bs = bits;
-       memset(bs, 0x00, sizeof(bits));
+       uint8_t i;
+       uint8_t bs[128];
+       memset(bs, 0x00, sizeof(bs));

        
        //Pyramid - compat mode, FSK2a, data rate 50, 4 data blocks
        uint32_t blocks[5] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0, 0};
        
        //Pyramid - compat mode, FSK2a, data rate 50, 4 data blocks
        uint32_t blocks[5] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0, 0};


@@ -108,9 +100,6 @@ int CmdPyramidClone(const char *Cmd) {
        facilitycode = (fc & 0x000000FF);
        cardnumber = (cn & 0x0000FFFF);
        
        facilitycode = (fc & 0x000000FF);
        cardnumber = (cn & 0x0000FFFF);
        

-       // get wiegand from printed number.
-       //GetWiegandFromPyramid(Cmd, &facilitycode, &cardnumber);
-       

        if ( !GetPyramidBits(facilitycode, cardnumber, bs)) {
                PrintAndLog("Error with tag bitstream generation.");
                return 1;
        if ( !GetPyramidBits(facilitycode, cardnumber, bs)) {
                PrintAndLog("Error with tag bitstream generation.");
                return 1;


@@ -121,16 +110,16 @@ int CmdPyramidClone(const char *Cmd) {
        blocks[3] = bytebits_to_byte(bs+64,32);
        blocks[4] = bytebits_to_byte(bs+96,32);
 
        blocks[3] = bytebits_to_byte(bs+64,32);
        blocks[4] = bytebits_to_byte(bs+96,32);
 

-       PrintAndLog("Preparing to clone Farepointe/Pyramid to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
+       PrintAndLog("Preparing to clone Farpointe/Pyramid to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);

        PrintAndLog("Blk | Data ");
        PrintAndLog("----+------------");
        PrintAndLog("Blk | Data ");
        PrintAndLog("----+------------");

-       for ( uint8_t i=0; i<5; ++i )
-       PrintAndLog(" %d | %08x",i , blocks[i]);
+       for ( i = 0; i<5; ++i )
+               PrintAndLog(" %02d | %08x", i, blocks[i]);

 
        UsbCommand resp;
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
 
        UsbCommand resp;
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 

-       for ( uint8_t i=0; i<5; ++i ) {
+       for ( i = 0; i<5; ++i ) {

                c.arg[0] = blocks[i];
                c.arg[1] = i;
                clearCommandBuffer();
                c.arg[0] = blocks[i];
                c.arg[1] = i;
                clearCommandBuffer();


@@ -144,29 +133,37 @@ int CmdPyramidClone(const char *Cmd) {
 }
 
 int CmdPyramidSim(const char *Cmd) {
 }
 
 int CmdPyramidSim(const char *Cmd) {

-       // uint32_t id = 0;
-       // uint64_t rawID = 0;
-       // uint8_t clk = 50, encoding = 1, separator = 0, invert = 0;

 
        char cmdp = param_getchar(Cmd, 0);
        if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_sim();
 
 
        char cmdp = param_getchar(Cmd, 0);
        if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_sim();
 

-       // id = param_get32ex(Cmd, 0, 0, 16);
-       // if (id == 0) return usage_lf_pyramid_sim();
+       uint32_t facilitycode = 0, cardnumber = 0, fc = 0, cn = 0;
+       
+       uint8_t bs[128];
+       size_t size = sizeof(bs);
+       memset(bs, 0x00, size);
+       
+       // Pyramid uses:  fcHigh: 10, fcLow: 8, clk: 50, invert: 0
+       uint64_t arg1, arg2;
+       arg1 = (10 << 8) + 8;
+       arg2 = 50 | 0;

 
 

-       //rawID = getPyramidBits(id);
+       if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_pyramid_sim();

 
 

-       // uint16_t arg1, arg2;
-       // size_t size = 64;
-       // arg1 = clk << 8 | encoding;
-       // arg2 = invert << 8 | separator;
+       facilitycode = (fc & 0x000000FF);
+       cardnumber = (cn & 0x0000FFFF);
+       
+       if ( !GetPyramidBits(facilitycode, cardnumber, bs)) {
+               PrintAndLog("Error with tag bitstream generation.");
+               return 1;
+       }       

 
 

-       // PrintAndLog("Simulating - ID: %08X, Raw: %08X%08X",id,(uint32_t)(rawID >> 32),(uint32_t) (rawID & 0xFFFFFFFF));
+       PrintAndLog("Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );

        
        

-       // UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
-       // num_to_bytebits(rawID, size, c.d.asBytes);
-       // clearCommandBuffer();
-       // SendCommand(&c);
+       UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
+       memcpy(c.d.asBytes, bs, size);
+       clearCommandBuffer();
+       SendCommand(&c);

        return 0;
 }
 
        return 0;
 }