RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-21 04:29:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

CHG: textual changes to help text.

Browse source 
CHG: removed the 'd' as input,  the clone/sim commands is simpler.
CHG: printing of card ID is now zero padded.
This commit is contained in:
iceman1001 2016-07-29 13:46:05 +02:00
parent 6c28395106
commit 8ae9b358f8
2 changed files with 32 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
client/cmdlfjablotron.c
View file

@ -12,26 +12,26 @@ static int CmdHelp(const char *Cmd);
int usage_lf_jablotron_clone(void){ int usage_lf_jablotron_clone(void){
PrintAndLog("clone a Jablotron tag to a T55x7 tag."); PrintAndLog("clone a Jablotron tag to a T55x7 tag.");
PrintAndLog("Usage: lf jablotron clone d <Card-ID> <Q5>"); PrintAndLog("Usage: lf jablotron clone [h] <card ID> <Q5>");
PrintAndLog("Options :"); PrintAndLog("Options:");
PrintAndLog(" d <Card-ID> : jablotron card ID"); PrintAndLog(" h : This help");
PrintAndLog(" <card ID> : jablotron card ID");
PrintAndLog(" <Q5> : specify write to Q5 (t5555 instead of t55x7)"); PrintAndLog(" <Q5> : specify write to Q5 (t5555 instead of t55x7)");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Sample : lf jablotron clone d 123456789"); PrintAndLog("Sample: lf jablotron clone d 112233");
return 0; return 0;
} }
int usage_lf_jablotron_sim(void) { int usage_lf_jablotron_sim(void) {
PrintAndLog("Enables simulation of jablotron card with specified card number."); PrintAndLog("Enables simulation of jablotron 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 jablotron format, the card number is 9 digit number and can contain *# chars. Larger values are truncated.");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Usage: lf jablotron sim d <Card-ID> or H <hex-ID>"); PrintAndLog("Usage: lf jablotron sim [h] <card ID>");
PrintAndLog("Options :"); PrintAndLog("Options:");
PrintAndLog(" d <Card-ID> : jablotron card number"); PrintAndLog(" h : This help");
// PrintAndLog(" H <hex-ID> : 8 digit hex card number"); PrintAndLog(" <card ID> : jablotron card ID");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Sample : lf jablotron sim d 123456789"); PrintAndLog("Sample: lf jablotron sim d 112233");
return 0; return 0;
} }
@ -88,7 +88,7 @@ int CmdJablotronDemod(const char *Cmd) {
cardid <<= 32; cardid <<= 32;
cardid |= (raw2 >> 8); cardid |= (raw2 >> 8);
PrintAndLog("Jablotron Tag Found: Card ID %12X", cardid); PrintAndLog("Jablotron Tag Found: Card ID %012X", cardid);
PrintAndLog("Raw: %08X%08X", raw1 ,raw2); PrintAndLog("Raw: %08X%08X", raw1 ,raw2);
setDemodBuf(DemodBuffer+ans, 64, 0); setDemodBuf(DemodBuffer+ans, 64, 0);
@ -98,11 +98,8 @@ int CmdJablotronDemod(const char *Cmd) {
} }
int CmdJablotronRead(const char *Cmd) { int CmdJablotronRead(const char *Cmd) {
// read lf silently
CmdLFRead("s"); CmdLFRead("s");
// get samples silently
getSamples("30000",false); getSamples("30000",false);
// demod and output Presco ID
return CmdJablotronDemod(Cmd); return CmdJablotronDemod(Cmd);
} }
@ -118,10 +115,10 @@ int CmdJablotronClone(const char *Cmd) {
char cmdp = param_getchar(Cmd, 0); char cmdp = param_getchar(Cmd, 0);
if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_jablotron_clone(); if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_jablotron_clone();
fullcode = param_get64ex(Cmd, 1, 0, 16); fullcode = param_get64ex(Cmd, 0, 0, 16);
//Q5 //Q5
if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q') { if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q') {
//t5555 (Q5) BITRATE = (RF-2)/2 (iceman) //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 64<<T5555_BITRATE_SHIFT | 2<<T5555_MAXBLOCK_SHIFT; blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 64<<T5555_BITRATE_SHIFT | 2<<T5555_MAXBLOCK_SHIFT;
} }
@ -140,7 +137,7 @@ int CmdJablotronClone(const char *Cmd) {
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);
PrintAndLog("Preparing to clone Jablotron to T55x7 with FullCode: %12X", fullcode); PrintAndLog("Preparing to clone Jablotron to T55x7 with FullCode: %012X", fullcode);
PrintAndLog("Blk | Data "); PrintAndLog("Blk | Data ");
PrintAndLog("----+------------"); PrintAndLog("----+------------");
PrintAndLog(" 00 | 0x%08x", blocks[0]); PrintAndLog(" 00 | 0x%08x", blocks[0]);
@ -169,7 +166,7 @@ int CmdJablotronSim(const char *Cmd) {
char cmdp = param_getchar(Cmd, 0); char cmdp = param_getchar(Cmd, 0);
if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_jablotron_sim(); if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_jablotron_sim();
fullcode = param_get64ex(Cmd, 1, 0, 16); fullcode = param_get64ex(Cmd, 0, 0, 16);
uint8_t clk = 64, encoding = 2, separator = 0, invert = 1; uint8_t clk = 64, encoding = 2, separator = 0, invert = 1;
uint16_t arg1, arg2; uint16_t arg1, arg2;
@ -177,7 +174,7 @@ int CmdJablotronSim(const char *Cmd) {
arg1 = clk << 8 | encoding; arg1 = clk << 8 | encoding;
arg2 = invert << 8 | separator; arg2 = invert << 8 | separator;
PrintAndLog("Simulating Jablotron - FullCode: %12X", fullcode); PrintAndLog("Simulating Jablotron - FullCode: %012X", fullcode);
UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}}; UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};
getJablotronBits(fullcode, c.d.asBytes); getJablotronBits(fullcode, c.d.asBytes);
@ -188,9 +185,9 @@ int CmdJablotronSim(const char *Cmd) {
static command_t CommandTable[] = { static command_t CommandTable[] = {
{"help", CmdHelp, 1, "This help"}, {"help", CmdHelp, 1, "This help"},
{"read", CmdJablotronRead, 0, "Attempt to read and Extract tag data"}, {"read", CmdJablotronRead, 0, "Attempt to read and extract tag data"},
{"clone", CmdJablotronClone, 0, "h <hex> [Q5] clone jablotron tag"}, {"clone", CmdJablotronClone, 0, "clone jablotron tag"},
{"sim", CmdJablotronSim, 0, "h <hex> simulate jablotron tag"}, {"sim", CmdJablotronSim, 0, "simulate jablotron tag"},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };

18
client/cmdlfnedap.c
View file

@ -14,12 +14,13 @@ static int CmdHelp(const char *Cmd);
int usage_lf_nedap_clone(void){ int usage_lf_nedap_clone(void){
PrintAndLog("clone a NEDAP tag to a T55x7 tag."); PrintAndLog("clone a NEDAP tag to a T55x7 tag.");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Usage: lf nedap clone <Card-Number>"); PrintAndLog("Usage: lf nedap clone [h] <Card-Number>");
PrintAndLog("Options :"); PrintAndLog("Options:");
PrintAndLog(" h : This help");
PrintAndLog(" <Card Number> : 24-bit value card number"); PrintAndLog(" <Card Number> : 24-bit value card number");
// PrintAndLog(" Q5 : optional - clone to Q5 (T5555) instead of T55x7 chip"); // PrintAndLog(" Q5 : optional - clone to Q5 (T5555) instead of T55x7 chip");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Sample : lf nedap clone 112233"); PrintAndLog("Sample: lf nedap clone 112233");
return 0; return 0;
} }
@ -27,11 +28,12 @@ int usage_lf_nedap_sim(void) {
PrintAndLog("Enables simulation of NEDAP card with specified card number."); PrintAndLog("Enables simulation of NEDAP 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(""); PrintAndLog("");
PrintAndLog("Usage: lf nedap sim <Card-Number>"); PrintAndLog("Usage: lf nedap sim [h] <Card-Number>");
PrintAndLog("Options :"); PrintAndLog("Options:");
PrintAndLog(" h : This help");
PrintAndLog(" <Card Number> : 24-bit value card number"); PrintAndLog(" <Card Number> : 24-bit value card number");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Sample : lf nedap sim 112233"); PrintAndLog("Sample: lf nedap sim 112233");
return 0; return 0;
} }
@ -277,7 +279,7 @@ int CmdLFNedapSim(const char *Cmd) {
arg1 = clk << 8 | encoding; arg1 = clk << 8 | encoding;
arg2 = invert << 8 | separator; arg2 = invert << 8 | separator;
if (sscanf(Cmd, "%u", &cn ) != 2) return usage_lf_nedap_sim(); if (sscanf(Cmd, "%u", &cn ) != 1) return usage_lf_nedap_sim();
cardnumber = (cn & 0x00FFFFFF); cardnumber = (cn & 0x00FFFFFF);
if ( !GetNedapBits(cardnumber, bs)) { if ( !GetNedapBits(cardnumber, bs)) {
@ -294,8 +296,6 @@ int CmdLFNedapSim(const char *Cmd) {
return 0; return 0;
} }
int CmdLFNedapChk(const char *Cmd){ int CmdLFNedapChk(const char *Cmd){
uint8_t data[256] = { 0x30, 0x16, 0x00, 0x71, 0x40, 0x21, 0xBE}; uint8_t data[256] = { 0x30, 0x16, 0x00, 0x71, 0x40, 0x21, 0xBE};