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

renames

Browse source
This commit is contained in:
iceman1001 2020-10-21 13:26:28 +02:00
commit ea6ac60726
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/src/cmdlfkeri.c
View file

@ -187,7 +187,7 @@ static int CmdKeriRead(const char *Cmd) {
static int CmdKeriClone(const char *Cmd) { static int CmdKeriClone(const char *Cmd) {
bool q5 = false, em4305 = false; bool q5 = false, em = false;
uint8_t keritype[2] = {'i'}; // default to internalid uint8_t keritype[2] = {'i'}; // default to internalid
int typeLen = 0; int typeLen = 0;
@ -233,7 +233,7 @@ static int CmdKeriClone(const char *Cmd) {
if (arg_get_lit(ctx, 5)) { if (arg_get_lit(ctx, 5)) {
blocks[0] = EM4305_KERI_CONFIG_BLOCK; blocks[0] = EM4305_KERI_CONFIG_BLOCK;
snprintf(cardtype, sizeof(cardtype) ,"EM4305/4469"); snprintf(cardtype, sizeof(cardtype) ,"EM4305/4469");
em4305 = true; em = true;
} }
typeLen = sizeof(keritype); typeLen = sizeof(keritype);
@ -243,7 +243,7 @@ static int CmdKeriClone(const char *Cmd) {
cid = arg_get_int_def(ctx, 4, 0); cid = arg_get_int_def(ctx, 4, 0);
CLIParserFree(ctx); CLIParserFree(ctx);
if (q5 && em4305) { if (q5 && em) {
PrintAndLogEx(FAILED, "Can't specify both Q5 and EM4305 at the same time"); PrintAndLogEx(FAILED, "Can't specify both Q5 and EM4305 at the same time");
return PM3_EINVARG; return PM3_EINVARG;
} }
@ -273,7 +273,7 @@ static int CmdKeriClone(const char *Cmd) {
print_blocks(blocks, ARRAYLEN(blocks)); print_blocks(blocks, ARRAYLEN(blocks));
int res; int res;
if (em4305) { if (em) {
res = em4x05_clone_tag(blocks, ARRAYLEN(blocks), 0, false); res = em4x05_clone_tag(blocks, ARRAYLEN(blocks), 0, false);
} else { } else {
res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); res = clone_t55xx_tag(blocks, ARRAYLEN(blocks));

8
client/src/cmdlfvisa2000.c
View file

@ -191,13 +191,13 @@ static int CmdVisa2kClone(const char *Cmd) {
} }
// EM4305 // EM4305
bool em4305 = tolower(param_getchar(Cmd, 1)) == 'e'; bool em = tolower(param_getchar(Cmd, 1)) == 'e';
if (em4305) { if (em) {
blocks[0] = EM4305_VISA2000_CONFIG_BLOCK; blocks[0] = EM4305_VISA2000_CONFIG_BLOCK;
snprintf(cardtype, sizeof(cardtype) ,"EM4305/4469"); snprintf(cardtype, sizeof(cardtype) ,"EM4305/4469");
} }
if (q5 && em4305) { if (q5 && em) {
PrintAndLogEx(FAILED, "Can't specify both Q5 and EM4305 at the same time"); PrintAndLogEx(FAILED, "Can't specify both Q5 and EM4305 at the same time");
return PM3_EINVARG; return PM3_EINVARG;
} }
@ -209,7 +209,7 @@ static int CmdVisa2kClone(const char *Cmd) {
print_blocks(blocks, ARRAYLEN(blocks)); print_blocks(blocks, ARRAYLEN(blocks));
int res; int res;
if (em4305) { if (em) {
res = em4x05_clone_tag(blocks, ARRAYLEN(blocks), 0, false); res = em4x05_clone_tag(blocks, ARRAYLEN(blocks), 0, false);
} else { } else {
res = clone_t55xx_tag(blocks, ARRAYLEN(blocks)); res = clone_t55xx_tag(blocks, ARRAYLEN(blocks));