RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-04-02 10:30:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

FIX: lets see if this fixes the pyramid clone crash on OSX

Browse source
This commit is contained in:
iceman1001 2016-02-27 18:57:49 +01:00
parent 69c4516d32
commit 90639dd1cc
2 changed files with 8 additions and 7 deletions

14
client/cmdlfpyramid.c
View file

@ -85,15 +85,10 @@ int CmdPyramidClone(const char *Cmd) {
if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_clone(); if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_clone();
uint32_t facilitycode=0, cardnumber=0, fc = 0, cn = 0; uint32_t facilitycode=0, cardnumber=0, fc = 0, cn = 0;
uint32_t blocks[5];
uint8_t i; uint8_t i;
uint8_t bs[128]; uint8_t bs[128];
memset(bs, 0x00, sizeof(bs)); 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};
// if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
// blocks[0] = T5555_MODULATION_FSK2 | 50<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_pyramid_clone(); if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_pyramid_clone();
@ -105,6 +100,11 @@ int CmdPyramidClone(const char *Cmd) {
return 1; return 1;
} }
// if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
// blocks[0] = T5555_MODULATION_FSK2 | 50<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
//Pyramid - compat mode, FSK2a, data rate 50, 4 data blocks
blocks[0] = T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4<<T55x7_MAXBLOCK_SHIFT;
blocks[1] = bytebits_to_byte(bs,32); blocks[1] = bytebits_to_byte(bs,32);
blocks[2] = bytebits_to_byte(bs+32,32); blocks[2] = bytebits_to_byte(bs+32,32);
blocks[3] = bytebits_to_byte(bs+64,32); blocks[3] = bytebits_to_byte(bs+64,32);
@ -114,7 +114,7 @@ int CmdPyramidClone(const char *Cmd) {
PrintAndLog("Blk | Data "); PrintAndLog("Blk | Data ");
PrintAndLog("----+------------"); PrintAndLog("----+------------");
for ( i = 0; i<5; ++i ) for ( i = 0; i<5; ++i )
PrintAndLog(" %02d | %08x", i, blocks[i]); PrintAndLog(" %02d | %08" PRIx32, i, blocks[i]);
UsbCommand resp; UsbCommand resp;
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}}; UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};

1
client/proxmark3.h
View file

@ -14,6 +14,7 @@
#define __STDC_FORMAT_MACROS 1 #define __STDC_FORMAT_MACROS 1
#include <inttypes.h> #include <inttypes.h>
#define lx PRIx32
#define llx PRIx64 #define llx PRIx64
#define lli PRIi64 #define lli PRIi64
#define llu PRIu64 #define llu PRIu64