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

chg: odl flexpass code removed

Browse source
This commit is contained in:
iceman1001 2019-11-19 12:17:08 +01:00
commit 41e0bf9a50
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/cmdlf.c
View file

@ -1054,10 +1054,9 @@ int CmdLFSimBidir(const char *Cmd) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
// ICEMAN, todo, swap from Graphbuffer. // ICEMAN, Verichip is Animal tag. Tested against correct reader
// according to Westhus this demod uses decimated samples / 2. /*
// need to do complete rewrite. Need access to reader / chip
// should be extracted to seperate files aswell
int CmdVchDemod(const char *Cmd) { int CmdVchDemod(const char *Cmd) {
if (GraphTraceLen < 4096) { if (GraphTraceLen < 4096) {
@ -1081,6 +1080,8 @@ int CmdVchDemod(const char *Cmd) {
1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
}; };
// iceman, using correlate as preamble detect seems way better than our current memcompare
// So first, we correlate for the sync pattern, and mark that. // So first, we correlate for the sync pattern, and mark that.
int bestCorrel = 0, bestPos = 0; int bestCorrel = 0, bestPos = 0;
int i, j, sum = 0; int i, j, sum = 0;
@ -1135,6 +1136,7 @@ int CmdVchDemod(const char *Cmd) {
} }
return PM3_SUCCESS; return PM3_SUCCESS;
} }
*/
static bool CheckChipType(bool getDeviceData) { static bool CheckChipType(bool getDeviceData) {
@ -1168,6 +1170,7 @@ out:
} }
int CmdLFfind(const char *Cmd) { int CmdLFfind(const char *Cmd) {
int retval = PM3_SUCCESS;
int ans = 0; int ans = 0;
size_t minLength = 2000; size_t minLength = 2000;
char cmdp = tolower(param_getchar(Cmd, 0)); char cmdp = tolower(param_getchar(Cmd, 0));
@ -1208,7 +1211,7 @@ int CmdLFfind(const char *Cmd) {
} }
if (readMotorolaUid()) { if (readMotorolaUid()) {
PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Motorola ID") "found!"); PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Motorola FlexPass ID") "found!");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -1250,7 +1253,6 @@ int CmdLFfind(const char *Cmd) {
if (demodGallagher() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("GALLAGHER ID") "found!"); goto out;} if (demodGallagher() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("GALLAGHER ID") "found!"); goto out;}
// if (demodTI() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Texas Instrument ID") "found!"); goto out;} // if (demodTI() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Texas Instrument ID") "found!"); goto out;}
//if (demodFermax() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Fermax ID") "found!"); goto out;} //if (demodFermax() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Fermax ID") "found!"); goto out;}
//if (demodFlex() == PM3_SUCCESS) { PrintAndLogEx(SUCCESS, "\nValid " _GREEN_("Motorola FlexPass ID") "found!"); goto out;}
PrintAndLogEx(FAILED, _RED_("No known 125/134 kHz tags found!")); PrintAndLogEx(FAILED, _RED_("No known 125/134 kHz tags found!"));
@ -1291,12 +1293,15 @@ int CmdLFfind(const char *Cmd) {
PrintAndLogEx(FAILED, _RED_("\nNo data found!")); PrintAndLogEx(FAILED, _RED_("\nNo data found!"));
} }
retval = PM3_ESOFT;
out: out:
// identify chipset // identify chipset
if (CheckChipType(isOnline) == false) { if (CheckChipType(isOnline) == false) {
PrintAndLogEx(DEBUG, "Automatic chip type detection " _RED_("failed")); PrintAndLogEx(DEBUG, "Automatic chip type detection " _RED_("failed"));
} }
return PM3_SUCCESS; return retval;
} }
static command_t CommandTable[] = { static command_t CommandTable[] = {
@ -1340,7 +1345,7 @@ static command_t CommandTable[] = {
{"sniff", CmdLFSniff, IfPm3Lf, "Sniff LF traffic between reader and tag"}, {"sniff", CmdLFSniff, IfPm3Lf, "Sniff LF traffic between reader and tag"},
{"tune", CmdLFTune, IfPm3Lf, "Continuously measure LF antenna tuning"}, {"tune", CmdLFTune, IfPm3Lf, "Continuously measure LF antenna tuning"},
// {"vchdemod", CmdVchDemod, AlwaysAvailable, "['clone'] -- Demodulate samples for VeriChip"}, // {"vchdemod", CmdVchDemod, AlwaysAvailable, "['clone'] -- Demodulate samples for VeriChip"},
{"flexdemod", CmdFlexdemod, AlwaysAvailable, "Demodulate samples for Motorola FlexPass"}, // {"flexdemod", CmdFlexdemod, AlwaysAvailable, "Demodulate samples for Motorola FlexPass"},
{NULL, NULL, NULL, NULL} {NULL, NULL, NULL, NULL}
}; };