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

ADD: added a comment about the Q5, which I think is wrong in these commands. Needs to be tested.

Browse source
This commit is contained in:
iceman1001 2016-05-16 21:40:19 +02:00
commit 890ae3dd43
5 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/cmdlfawid.c
View file

@ -28,8 +28,9 @@ int usage_lf_awid_fskdemod(void) {
PrintAndLog("By default, values are printed and logged until the button is pressed or another USB command is issued."); PrintAndLog("By default, values are printed and logged until the button is pressed or another USB command is issued.");
PrintAndLog("If the [1] option is provided, reader mode is exited after reading a single AWID card."); PrintAndLog("If the [1] option is provided, reader mode is exited after reading a single AWID card.");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Usage: lf awid fskdemod [1]"); PrintAndLog("Usage: lf awid fskdemod [h] [1]");
PrintAndLog("Options :"); PrintAndLog("Options :");
PrintAndLog(" h : This help");
PrintAndLog(" 1 : (optional) stop after reading a single card"); PrintAndLog(" 1 : (optional) stop after reading a single card");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Samples"); PrintAndLog("Samples");
@ -42,8 +43,9 @@ int usage_lf_awid_sim(void) {
PrintAndLog("Enables simulation of AWID card with specified facility-code and card number."); PrintAndLog("Enables simulation of AWID card with specified facility-code and 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 awid sim <format> <facility-code> <card-number>"); PrintAndLog("Usage: lf awid sim [h] <format> <facility-code> <card-number>");
PrintAndLog("Options :"); PrintAndLog("Options :");
PrintAndLog(" h : This help");
PrintAndLog(" <format> : format length 26|50"); PrintAndLog(" <format> : format length 26|50");
PrintAndLog(" <facility-code> : 8|16bit value facility code"); PrintAndLog(" <facility-code> : 8|16bit value facility code");
PrintAndLog(" <card number> : 16|32-bit value card number"); PrintAndLog(" <card number> : 16|32-bit value card number");
@ -58,8 +60,9 @@ int usage_lf_awid_clone(void) {
PrintAndLog("Enables cloning of AWID card with specified facility-code and card number onto T55x7."); PrintAndLog("Enables cloning of AWID card with specified facility-code and card number onto T55x7.");
PrintAndLog("The T55x7 must be on the antenna when issuing this command. T55x7 blocks are calculated and printed in the process."); PrintAndLog("The T55x7 must be on the antenna when issuing this command. T55x7 blocks are calculated and printed in the process.");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Usage: lf awid clone <format> <facility-code> <card-number>"); PrintAndLog("Usage: lf awid clone [h] <format> <facility-code> <card-number> [Q5]");
PrintAndLog("Options :"); PrintAndLog("Options :");
PrintAndLog(" h : This help");
PrintAndLog(" <format> : format length 26|50"); PrintAndLog(" <format> : format length 26|50");
PrintAndLog(" <facility-code> : 8|16bit value facility code"); PrintAndLog(" <facility-code> : 8|16bit value facility code");
PrintAndLog(" <card number> : 16|32-bit value card number"); PrintAndLog(" <card number> : 16|32-bit value card number");
@ -75,8 +78,9 @@ int usage_lf_awid_brute(void){
PrintAndLog("Enables bruteforce of AWID reader with specified facility-code."); PrintAndLog("Enables bruteforce of AWID reader with specified facility-code.");
PrintAndLog("This is a incremental attack against reader."); PrintAndLog("This is a incremental attack against reader.");
PrintAndLog(""); PrintAndLog("");
PrintAndLog("Usage: lf awid brute <format> <facility-code>"); PrintAndLog("Usage: lf awid brute [h] <format> <facility-code>");
PrintAndLog("Options :"); PrintAndLog("Options :");
PrintAndLog(" h : This help");
PrintAndLog(" <format> : format length 26|50"); PrintAndLog(" <format> : format length 26|50");
PrintAndLog(" <facility-code> : 8|16bit value facility code"); PrintAndLog(" <facility-code> : 8|16bit value facility code");
PrintAndLog(""); PrintAndLog("");
@ -226,6 +230,7 @@ int CmdAWIDClone(const char *Cmd) {
} }
if (param_getchar(Cmd, 4) == 'Q' || param_getchar(Cmd, 4) == 'q') if (param_getchar(Cmd, 4) == 'Q' || param_getchar(Cmd, 4) == 'q')
//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 50<<T5555_BITRATE_SHIFT | 3<<T5555_MAXBLOCK_SHIFT; blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 50<<T5555_BITRATE_SHIFT | 3<<T5555_MAXBLOCK_SHIFT;
if ( !getAWIDBits(fmtlen, fc, cn, bs)) { if ( !getAWIDBits(fmtlen, fc, cn, bs)) {

1
client/cmdlfguard.c
View file

@ -140,6 +140,7 @@ int CmdGuardClone(const char *Cmd) {
uint32_t blocks[5] = {T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 3<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0, 0}; uint32_t blocks[5] = {T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 3<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0, 0};
// if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q') // if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
// blocks[0] = T5555_MODULATION_FSK2 | 50<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT; // blocks[0] = T5555_MODULATION_FSK2 | 50<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_guard_clone(); if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_guard_clone();

1
client/cmdlfnedap.c
View file

@ -197,6 +197,7 @@ int CmdLFNedapClone(const char *Cmd) {
blocks[0] = T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 4<<T55x7_MAXBLOCK_SHIFT; blocks[0] = T55x7_MODULATION_BIPHASE | T55x7_BITRATE_RF_64 | 4<<T55x7_MAXBLOCK_SHIFT;
if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q') if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 64<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT; blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 64<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
blocks[1] = bytebits_to_byte(bs,32); blocks[1] = bytebits_to_byte(bs,32);

1
client/cmdlfpresco.c
View file

@ -170,6 +170,7 @@ int CmdPrescoClone(const char *Cmd) {
if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_clone(); if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_clone();
if (Q5) if (Q5)
//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
blocks[0] = T5555_MODULATION_MANCHESTER | 32<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR; blocks[0] = T5555_MODULATION_MANCHESTER | 32<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR;
if ((sitecode & 0xFF) != sitecode) { if ((sitecode & 0xFF) != sitecode) {

1
client/cmdlfpyramid.c
View file

@ -103,6 +103,7 @@ int CmdPyramidClone(const char *Cmd) {
blocks[0] = T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4<<T55x7_MAXBLOCK_SHIFT; blocks[0] = T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4<<T55x7_MAXBLOCK_SHIFT;
if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q') if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 50<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT; blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 50<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
blocks[1] = bytebits_to_byte(bs,32); blocks[1] = bytebits_to_byte(bs,32);