mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-19 21:03:48 -07:00
style
This commit is contained in:
parent
895410aec0
commit
ffd03dadaa
7 changed files with 40 additions and 40 deletions
|
@ -442,15 +442,15 @@ static int CmdAWIDClone(const char *Cmd) {
|
||||||
|
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
SetConfigWithBlock0(blocks[0]);
|
SetConfigWithBlock0(blocks[0]);
|
||||||
if ( t55xxAquireAndCompareBlock0(false, 0, blocks[0], false) )
|
if (t55xxAquireAndCompareBlock0(false, 0, blocks[0], false))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
||||||
res++;
|
res++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( res == 0 )
|
if (res == 0)
|
||||||
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
||||||
|
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
|
|
|
@ -323,15 +323,15 @@ static int CmdFdxClone(const char *Cmd) {
|
||||||
|
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
SetConfigWithBlock0(blocks[0]);
|
SetConfigWithBlock0(blocks[0]);
|
||||||
if ( t55xxAquireAndCompareBlock0(false, 0, blocks[0], false) )
|
if (t55xxAquireAndCompareBlock0(false, 0, blocks[0], false))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
||||||
res++;
|
res++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( res == 0 )
|
if (res == 0)
|
||||||
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
||||||
|
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
|
|
|
@ -210,15 +210,15 @@ static int CmdGuardClone(const char *Cmd) {
|
||||||
|
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
SetConfigWithBlock0(blocks[0]);
|
SetConfigWithBlock0(blocks[0]);
|
||||||
if ( t55xxAquireAndCompareBlock0(false, 0, blocks[0], false) )
|
if (t55xxAquireAndCompareBlock0(false, 0, blocks[0], false))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
||||||
res++;
|
res++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( res == 0 )
|
if (res == 0)
|
||||||
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
||||||
|
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
|
|
|
@ -444,7 +444,7 @@ static int CmdIndalaSim(const char *Cmd) {
|
||||||
static int CmdIndalaClone(const char *Cmd) {
|
static int CmdIndalaClone(const char *Cmd) {
|
||||||
|
|
||||||
bool isLongUid = false;
|
bool isLongUid = false;
|
||||||
uint32_t blocks[8] = {0};
|
uint32_t blocks[8] = {0};
|
||||||
uint8_t max = 0;
|
uint8_t max = 0;
|
||||||
|
|
||||||
uint8_t data[7 * 4];
|
uint8_t data[7 * 4];
|
||||||
|
@ -470,17 +470,17 @@ static int CmdIndalaClone(const char *Cmd) {
|
||||||
CLIGetHexWithReturn(2, data, &datalen);
|
CLIGetHexWithReturn(2, data, &datalen);
|
||||||
CLIParserFree();
|
CLIParserFree();
|
||||||
|
|
||||||
/*
|
/*
|
||||||
//TODO add selection of chip for Q5 or T55x7
|
//TODO add selection of chip for Q5 or T55x7
|
||||||
|
|
||||||
// data[0] = T5555_SET_BITRATE(32 | T5555_MODULATION_PSK2 | 7 << T5555_MAXBLOCK_SHIFT;
|
// data[0] = T5555_SET_BITRATE(32 | T5555_MODULATION_PSK2 | 7 << T5555_MAXBLOCK_SHIFT;
|
||||||
//Alternative config for Indala (Extended mode;RF/32;PSK1 with RF/2;Maxblock=7;Inverse data)
|
//Alternative config for Indala (Extended mode;RF/32;PSK1 with RF/2;Maxblock=7;Inverse data)
|
||||||
// T5567WriteBlock(0x603E10E2,0);
|
// T5567WriteBlock(0x603E10E2,0);
|
||||||
|
|
||||||
// data[0] = T5555_SET_BITRATE(32 | T5555_MODULATION_PSK1 | 2 << T5555_MAXBLOCK_SHIFT;
|
// data[0] = T5555_SET_BITRATE(32 | T5555_MODULATION_PSK1 | 2 << T5555_MAXBLOCK_SHIFT;
|
||||||
//Alternative config for Indala (Extended mode;RF/32;PSK1 with RF/2;Maxblock=2;Inverse data)
|
//Alternative config for Indala (Extended mode;RF/32;PSK1 with RF/2;Maxblock=2;Inverse data)
|
||||||
// T5567WriteBlock(0x603E1042,0);
|
// T5567WriteBlock(0x603E1042,0);
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (isLongUid) {
|
if (isLongUid) {
|
||||||
// config for Indala (RF/32;PSK2 with RF/2;Maxblock=7)
|
// config for Indala (RF/32;PSK2 with RF/2;Maxblock=7)
|
||||||
|
@ -495,7 +495,7 @@ static int CmdIndalaClone(const char *Cmd) {
|
||||||
blocks[7] = bytes_to_num(data + 24, 4);
|
blocks[7] = bytes_to_num(data + 24, 4);
|
||||||
max = 8;
|
max = 8;
|
||||||
} else {
|
} else {
|
||||||
// config for Indala 64 format (RF/32;PSK1 with RF/2;Maxblock=2)
|
// config for Indala 64 format (RF/32;PSK1 with RF/2;Maxblock=2)
|
||||||
PrintAndLogEx(INFO, "Preparing to clone Indala 64bit tag with RawID %s", sprint_hex(data, datalen));
|
PrintAndLogEx(INFO, "Preparing to clone Indala 64bit tag with RawID %s", sprint_hex(data, datalen));
|
||||||
blocks[0] = T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK1 | (2 << T55x7_MAXBLOCK_SHIFT);
|
blocks[0] = T55x7_BITRATE_RF_32 | T55x7_MODULATION_PSK1 | (2 << T55x7_MAXBLOCK_SHIFT);
|
||||||
blocks[1] = bytes_to_num(data, 4);
|
blocks[1] = bytes_to_num(data, 4);
|
||||||
|
@ -530,15 +530,15 @@ static int CmdIndalaClone(const char *Cmd) {
|
||||||
|
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
SetConfigWithBlock0(blocks[0]);
|
SetConfigWithBlock0(blocks[0]);
|
||||||
if ( t55xxAquireAndCompareBlock0(false, 0, blocks[0], false) )
|
if (t55xxAquireAndCompareBlock0(false, 0, blocks[0], false))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
||||||
res++;
|
res++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( res == 0 )
|
if (res == 0)
|
||||||
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
||||||
|
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
|
|
|
@ -269,7 +269,7 @@ static int CmdIOProxClone(const char *Cmd) {
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t blocks[3] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
|
uint32_t blocks[3] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_64 | 2 << T55x7_MAXBLOCK_SHIFT, 0, 0};
|
||||||
|
|
||||||
if (tolower(param_getchar(Cmd, 3) == 'q'))
|
if (tolower(param_getchar(Cmd, 3) == 'q'))
|
||||||
blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT;
|
blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | T5555_SET_BITRATE(64) | 2 << T5555_MAXBLOCK_SHIFT;
|
||||||
|
|
||||||
|
@ -304,17 +304,17 @@ static int CmdIOProxClone(const char *Cmd) {
|
||||||
|
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
SetConfigWithBlock0(blocks[0]);
|
SetConfigWithBlock0(blocks[0]);
|
||||||
if ( t55xxAquireAndCompareBlock0(false, 0, blocks[0], false) )
|
if (t55xxAquireAndCompareBlock0(false, 0, blocks[0], false))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
||||||
res++;
|
res++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( res == 0 )
|
if (res == 0)
|
||||||
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
||||||
|
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -197,17 +197,17 @@ static int CmdJablotronClone(const char *Cmd) {
|
||||||
|
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
SetConfigWithBlock0(blocks[0]);
|
SetConfigWithBlock0(blocks[0]);
|
||||||
if ( t55xxAquireAndCompareBlock0(false, 0, blocks[0], false) )
|
if (t55xxAquireAndCompareBlock0(false, 0, blocks[0], false))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
||||||
res++;
|
res++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( res == 0 )
|
if (res == 0)
|
||||||
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
||||||
|
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -186,17 +186,17 @@ static int CmdKeriClone(const char *Cmd) {
|
||||||
|
|
||||||
if (i == 0) {
|
if (i == 0) {
|
||||||
SetConfigWithBlock0(blocks[0]);
|
SetConfigWithBlock0(blocks[0]);
|
||||||
if ( t55xxAquireAndCompareBlock0(false, 0, blocks[0], false) )
|
if (t55xxAquireAndCompareBlock0(false, 0, blocks[0], false))
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
if (t55xxVerifyWrite(i, 0, false, false, 0, 0xFF, blocks[i]) == false)
|
||||||
res++;
|
res++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( res == 0 )
|
if (res == 0)
|
||||||
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
PrintAndLogEx(SUCCESS, "Success writing to tag");
|
||||||
|
|
||||||
return PM3_SUCCESS;
|
return PM3_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue