github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 21:33:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

change gprox ii clone/sim to handle 20b cardnumber for the 36b format

Browse source
This commit is contained in:
iceman1001 2022-01-07 21:06:07 +01:00
commit a432b49393
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/src/cmdlfguard.c
View file

@ -236,8 +236,8 @@ static int CmdGuardClone(const char *Cmd) {
CLIParserContext *ctx; CLIParserContext *ctx;
CLIParserInit(&ctx, "lf gproxii clone", CLIParserInit(&ctx, "lf gproxii clone",
"clone a Guardall tag to a T55x7, Q5/T5555 or EM4305/4469 tag.\n" "clone a Guardall tag to a T55x7, Q5/T5555 or EM4305/4469 tag.\n"
"The facility-code is 8-bit and the card number is 16-bit. Larger values are truncated.\n" "The facility-code is 8-bit and the card number is 20-bit. Larger values are truncated.\n"
"Currently work only on 26bit", "Currently work only on 26 | 36 bit format",
"lf gproxii clone --fmt 26 --fc 123 --cn 1337\n" "lf gproxii clone --fmt 26 --fc 123 --cn 1337\n"
"lf gproxii clone --q5 --fmt 26 --fc 123 --cn 1337 -> encode for Q5/T5555 tag\n" "lf gproxii clone --q5 --fmt 26 --fc 123 --cn 1337 -> encode for Q5/T5555 tag\n"
"lf gproxii clone --em --fmt 26 --fc 123 --cn 1337 -> encode for EM4305/4469" "lf gproxii clone --em --fmt 26 --fc 123 --cn 1337 -> encode for EM4305/4469"
@ -268,7 +268,7 @@ static int CmdGuardClone(const char *Cmd) {
fmtlen &= 0x7f; fmtlen &= 0x7f;
uint32_t facilitycode = (fc & 0x000000FF); uint32_t facilitycode = (fc & 0x000000FF);
uint32_t cardnumber = (cn & 0x0000FFFF); uint32_t cardnumber = (cn & 0x00FFFFFF);
//GuardProxII - compat mode, ASK/Biphase, data rate 64, 3 data blocks //GuardProxII - compat mode, ASK/Biphase, data rate 64, 3 data blocks
uint8_t *bs = calloc(96, sizeof(uint8_t)); uint8_t *bs = calloc(96, sizeof(uint8_t));
@ -323,7 +323,7 @@ static int CmdGuardSim(const char *Cmd) {
"Enables simulation of Guardall card with specified card number.\n" "Enables simulation of Guardall card with specified card number.\n"
"Simulation runs until the button is pressed or another USB command is issued.\n" "Simulation runs until the button is pressed or another USB command is issued.\n"
"The facility-code is 8-bit and the card number is 16-bit. Larger values are truncated.\n" "The facility-code is 8-bit and the card number is 16-bit. Larger values are truncated.\n"
"Currently work only on 26bit", "Currently work only on 26 | 36 bit format",
"lf gproxii sim --fmt 26 --fc 123 --cn 1337\n" "lf gproxii sim --fmt 26 --fc 123 --cn 1337\n"
); );
@ -343,7 +343,7 @@ static int CmdGuardSim(const char *Cmd) {
fmtlen &= 0x7F; fmtlen &= 0x7F;
uint32_t facilitycode = (fc & 0x000000FF); uint32_t facilitycode = (fc & 0x000000FF);
uint32_t cardnumber = (cn & 0x0000FFFF); uint32_t cardnumber = (cn & 0x000FFFFF);
uint8_t bs[96]; uint8_t bs[96];
memset(bs, 0x00, sizeof(bs)); memset(bs, 0x00, sizeof(bs));