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

Merge branch 'master' of github.com:RfidResearchGroup/proxmark3

Browse source
This commit is contained in:
iceman1001 2021-04-16 00:25:38 +02:00
commit 44edec6fcd
8 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
armsrc/Standalone/hf_14asniff.c
View file

@ -37,8 +37,8 @@
* 2. trace load trace.trc * 2. trace load trace.trc
* Loads trace data from a file into PC-side buffers. * Loads trace data from a file into PC-side buffers.
* *
* 3. For ISO14a: trace list 14a 1 * 3. For ISO14a: trace list -t 14a -1
* For MIFARE Classic: trace list mf 1 * For MIFARE Classic: trace list -t mf -1
* *
* Lists trace data from buffer without requesting it from PM3. * Lists trace data from buffer without requesting it from PM3.
* *

2
armsrc/hitag2.c
View file

@ -1897,7 +1897,7 @@ void ReaderHitag(hitag_function htf, hitag_data *htd) {
LogTrace(rx, nbytes(rxlen), response_start, response_start + response_duration, NULL, false); LogTrace(rx, nbytes(rxlen), response_start, response_start + response_duration, NULL, false);
// TODO when using cumulative time for command_start, pm3 doesn't reply anymore, e.g. on lf hitag read 23 4F4E4D494B52 // TODO when using cumulative time for command_start, pm3 doesn't reply anymore, e.g. on lf hitag reader --23 -k 4F4E4D494B52
// Use delta time? // Use delta time?
// command_start = response_start + response_duration; // command_start = response_start + response_duration;
command_start = 0; command_start = 0;

2
client/src/cmdhf14b.c
View file

@ -263,7 +263,7 @@ static int CmdHF14BSniff(const char *Cmd) {
WaitForResponse(CMD_HF_ISO14443B_SNIFF, &resp); WaitForResponse(CMD_HF_ISO14443B_SNIFF, &resp);
PrintAndLogEx(HINT, "Try `" _YELLOW_("hf 14b list") "` to view captured tracelog"); PrintAndLogEx(HINT, "Try `" _YELLOW_("hf 14b list") "` to view captured tracelog");
PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save h") "` to save tracelog for later analysing"); PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing");
return PM3_SUCCESS; return PM3_SUCCESS;
} }

2
client/src/cmdhf15.c
View file

@ -954,7 +954,7 @@ static int CmdHF15Sniff(const char *Cmd) {
WaitForResponse(CMD_HF_ISO15693_SNIFF, &resp); WaitForResponse(CMD_HF_ISO15693_SNIFF, &resp);
PrintAndLogEx(HINT, "Try `" _YELLOW_("hf 15 list") "` to view captured tracelog"); PrintAndLogEx(HINT, "Try `" _YELLOW_("hf 15 list") "` to view captured tracelog");
PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save h") "` to save tracelog for later analysing"); PrintAndLogEx(HINT, "Try `" _YELLOW_("trace save -h") "` to save tracelog for later analysing");
return PM3_SUCCESS; return PM3_SUCCESS;
} }

2
client/src/cmdhffelica.c
View file

@ -1935,7 +1935,7 @@ static int CmdHFFelicaDumpLite(const char *Cmd) {
iceman 2021, iceman 2021,
Why does this command say it dumps a FeliCa lite card Why does this command say it dumps a FeliCa lite card
and then tries to print a trace?!? and then tries to print a trace?!?
Is this a trace list or a feclia dump cmd? Is this a trace list or a FeliCa dump cmd?
*/ */

2
doc/cloner_notes.md
View file

@ -79,4 +79,4 @@ lf t55xx sniff -1
It uses the existing `lf sniff` command to collect the data, so setting that first as per normal sniffing is recommended. Once you have a sniff, you can "re-sniff" from the stored sniffed data and try different settings, if you think the data is not clean. It uses the existing `lf sniff` command to collect the data, so setting that first as per normal sniffing is recommended. Once you have a sniff, you can "re-sniff" from the stored sniffed data and try different settings, if you think the data is not clean.
As normal, the cloner may write data past the end of the 40K sample buffer. So using the `lf config s <x bytes>` then re-run the sniff to see if there is more data. As normal, the cloner may write data past the end of the 40K sample buffer. So using the `lf config -s <x bytes>` then re-run the sniff to see if there is more data.

8
doc/magic_cards_notes.md
View file

@ -195,7 +195,7 @@ hf mf csetuid -u 11223344 -a 0044 -s 18
``` ```
``` ```
script run run hf_mf_magicrevive script run hf_mf_magicrevive
``` ```
To execute commands manually: To execute commands manually:
@ -499,9 +499,9 @@ BCC1 Int LCK0 LCK1
UID is made of SN0..SN6 bytes UID is made of SN0..SN6 bytes
Computing BCC0 on UID 04112233445566: `analyse lcr 88041122` = `bf` Computing BCC0 on UID 04112233445566: `analyse lcr -d 88041122` = `bf`
Computing BCC1 on UID 04112233445566: `analyse lcr 33445566` = `44` Computing BCC1 on UID 04112233445566: `analyse lcr -d 33445566` = `44`
Int is internal, typically 0x48 Int is internal, typically 0x48
@ -538,7 +538,7 @@ When "soft-bricked" (by writing invalid data in block0), these ones may help:
``` ```
hf 14a config -h hf 14a config -h
script run run hf_mf_magicrevive -u script run hf_mf_magicrevive -u
``` ```
## MIFARE Ultralight DirectWrite ## MIFARE Ultralight DirectWrite

4
tools/hitag2crack/README.md
View file

@ -167,7 +167,7 @@ response pairs for the same tag UID.
**TODO** will be ht2 sim or sniff with actual tag ? **TODO** will be ht2 sim or sniff with actual tag ?
``` ```
pm3 --> lf hitag sniff l pm3 --> lf hitag sniff
``` ```
It creates a file `Hitag2_<UID>_<nR>_<aR>_collection.txt`. It creates a file `Hitag2_<UID>_<nR>_<aR>_collection.txt`.
@ -184,7 +184,7 @@ Attack 4 requires the same information as attack 3, but only 16-32 encrypted
nonce and challenge response pairs are required. nonce and challenge response pairs are required.
``` ```
pm3 --> lf hitag sniff l pm3 --> lf hitag sniff
``` ```
It creates a file `Hitag2_<UID>_<nR>_<aR>_collection.txt`. It creates a file `Hitag2_<UID>_<nR>_<aR>_collection.txt`.