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

Merge pull request #959 from mwalker33/T55xx-Sniff

Browse source 
T55xx sniff
This commit is contained in:
Iceman 2020-09-17 10:30:25 +02:00 • committed by GitHub
commit 896060bccb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log... This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
## [unreleased][unreleased] ## [unreleased][unreleased]
- Add lf t55xx sniff to allow extracting commands and passwords used be cloners. (@mwalker33)
- Add options to `lf read` and `lf cmdread` (@doegox) - Add options to `lf read` and `lf cmdread` (@doegox)
- Change options of `lf read` to match `lf cmdread`, this affects historical `d` and `s` options (@doegox) - Change options of `lf read` to match `lf cmdread`, this affects historical `d` and `s` options (@doegox)
- Add `hf waveshare` to upload picture to Waveshare NFC-Powered e-Paper (@doegox) - Add `hf waveshare` to upload picture to Waveshare NFC-Powered e-Paper (@doegox)

14
client/src/cmdlft55xx.c
View file

@ -401,17 +401,17 @@ static int usage_t55xx_clonehelp(void) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
static int usage_t55xx_sniff(void) { static int usage_t55xx_sniff(void) {
PrintAndLogEx(NORMAL, "Usage: lf t55xx sniff [w <width 0> <width 1>] [l <min level>] [b] [h]"); PrintAndLogEx(NORMAL, "Usage: lf t55xx sniff [w <width 0> <width 1>] [l <min level>] [s <level>] [1] [h]");
PrintAndLogEx(NORMAL, "Options:"); PrintAndLogEx(NORMAL, "Options:");
PrintAndLogEx(NORMAL, " w <0> <1> - Set samples width for 0 and 1 matching (default auto detect)"); PrintAndLogEx(NORMAL, " w <0> <1> - Set samples width for 0 and 1 matching (default auto detect)");
PrintAndLogEx(NORMAL, " l <level> - Set minimum signal level (default 20)"); PrintAndLogEx(NORMAL, " s <level> - Set minimum signal level (default 20)");
PrintAndLogEx(NORMAL, " b - Extract from current sample buffer (default will get new samples)"); PrintAndLogEx(NORMAL, " 1 - Extract from current sample buffer (default will get new samples)");
PrintAndLogEx(NORMAL, " h - This help"); PrintAndLogEx(NORMAL, " h - This help");
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(NORMAL, "Examples:"); PrintAndLogEx(NORMAL, "Examples:");
PrintAndLogEx(NORMAL, _YELLOW_(" lf t55xx sniff")); PrintAndLogEx(NORMAL, _YELLOW_(" lf t55xx sniff"));
PrintAndLogEx(NORMAL, _YELLOW_(" lf t55xx sniff b")); PrintAndLogEx(NORMAL, _YELLOW_(" lf t55xx sniff 1"));
PrintAndLogEx(NORMAL, _YELLOW_(" lf t55xx sniff w 7 14 b")); PrintAndLogEx(NORMAL, _YELLOW_(" lf t55xx sniff w 7 14 1"));
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -3777,7 +3777,7 @@ static int CmdT55xxSniff(const char *Cmd) {
switch (tolower(param_getchar(Cmd, cmdp))) { switch (tolower(param_getchar(Cmd, cmdp))) {
case 'h': case 'h':
return usage_t55xx_sniff(); return usage_t55xx_sniff();
case 'b': case '1':
sampleData = false; sampleData = false;
cmdp ++; cmdp ++;
break; break;
@ -3793,7 +3793,7 @@ static int CmdT55xxSniff(const char *Cmd) {
return usage_t55xx_sniff(); return usage_t55xx_sniff();
} }
break; break;
case 'l': case 's':
minLevel = param_get8ex(Cmd, cmdp + 1, 0, 10); minLevel = param_get8ex(Cmd, cmdp + 1, 0, 10);
cmdp += 2; cmdp += 2;
break; break;