mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-14 18:48:13 -07:00
make style
This commit is contained in:
merlokk
parent
b3655a43f8
commit
ca40ee99d6
3 changed files with 32 additions and 32 deletions
|
|
@ -1480,20 +1480,20 @@ int lf_em410x_watch(int findone, uint32_t *high, uint64_t *low) {
|
|||
if (type > 0) {
|
||||
if (type & 0x1) {
|
||||
Dbprintf("EM TAG ID: " _GREEN_("%02x%08x") " - ( %05d_%03d_%08d )",
|
||||
(uint32_t)(lo >> 32),
|
||||
(uint32_t)lo,
|
||||
(uint32_t)(lo & 0xFFFF),
|
||||
(uint32_t)((lo >> 16LL) & 0xFF),
|
||||
(uint32_t)(lo & 0xFFFFFF));
|
||||
(uint32_t)(lo >> 32),
|
||||
(uint32_t)lo,
|
||||
(uint32_t)(lo & 0xFFFF),
|
||||
(uint32_t)((lo >> 16LL) & 0xFF),
|
||||
(uint32_t)(lo & 0xFFFFFF));
|
||||
}
|
||||
if (type & 0x2) {
|
||||
Dbprintf("EM XL TAG ID: " _GREEN_("%06x%08x%08x") " - ( %05d_%03d_%08d )",
|
||||
hi,
|
||||
(uint32_t)(lo >> 32),
|
||||
(uint32_t)lo,
|
||||
(uint32_t)(lo & 0xFFFF),
|
||||
(uint32_t)((lo >> 16LL) & 0xFF),
|
||||
(uint32_t)(lo & 0xFFFFFF));
|
||||
hi,
|
||||
(uint32_t)(lo >> 32),
|
||||
(uint32_t)lo,
|
||||
(uint32_t)(lo & 0xFFFF),
|
||||
(uint32_t)((lo >> 16LL) & 0xFF),
|
||||
(uint32_t)(lo & 0xFFFFFF));
|
||||
}
|
||||
if (type & 0x4) {
|
||||
uint64_t data = (lo << 20) >> 20;
|
||||
|
|
@ -1501,21 +1501,21 @@ int lf_em410x_watch(int findone, uint32_t *high, uint64_t *low) {
|
|||
uint64_t id = ((uint64_t)hi << 16) | (lo >> 48);
|
||||
if ((data & 0xFFFFFFFF) == 0) {
|
||||
Dbprintf("EM TAG ID: " _GREEN_("%02x%08x") " - ( %05d_%03d_%08d ) Electra "_GREEN_("%i"),
|
||||
(uint32_t)(id >> 32),
|
||||
(uint32_t)id,
|
||||
(uint32_t)(id & 0xFFFF),
|
||||
(uint32_t)((id >> 16LL) & 0xFF),
|
||||
(uint32_t)(id & 0xFFFFFF),
|
||||
(uint32_t)(data >> 32));
|
||||
(uint32_t)(id >> 32),
|
||||
(uint32_t)id,
|
||||
(uint32_t)(id & 0xFFFF),
|
||||
(uint32_t)((id >> 16LL) & 0xFF),
|
||||
(uint32_t)(id & 0xFFFFFF),
|
||||
(uint32_t)(data >> 32));
|
||||
} else {
|
||||
Dbprintf("EM TAG ID: " _GREEN_("%02x%08x") " - ( %05d_%03d_%08d ) on 128b frame with data "_GREEN_("%03x%08x"),
|
||||
(uint32_t)(id >> 32),
|
||||
(uint32_t)id,
|
||||
(uint32_t)(id & 0xFFFF),
|
||||
(uint32_t)((id >> 16LL) & 0xFF),
|
||||
(uint32_t)(id & 0xFFFFFF),
|
||||
(uint32_t)(data >> 32),
|
||||
(uint32_t)data);
|
||||
(uint32_t)(id >> 32),
|
||||
(uint32_t)id,
|
||||
(uint32_t)(id & 0xFFFF),
|
||||
(uint32_t)((id >> 16LL) & 0xFF),
|
||||
(uint32_t)(id & 0xFFFFFF),
|
||||
(uint32_t)(data >> 32),
|
||||
(uint32_t)data);
|
||||
}
|
||||
}
|
||||
if (findone) {
|
||||
|
|
|
|||
|
|
@ -973,7 +973,7 @@
|
|||
},
|
||||
"help": {
|
||||
"command": "help",
|
||||
"description": "help use `<command> help` for details of a command prefs { edit client/device preferences... } -------- ----------------------- technology ----------------------- analyse { analyse utils... } data { plot window / data buffer manipulation... } emv { emv iso-14443 / iso-7816... } hf { high frequency commands... } hw { hardware commands... } lf { low frequency commands... } nfc { nfc commands... } reveng { crc calculations from reveng software... } smart { smart card iso-7816 commands... } script { scripting commands... } trace { trace manipulation... } wiegand { wiegand format manipulation... } -------- ----------------------- general ----------------------- clear clear screen hints turn hints on / off msleep add a pause in milliseconds rem add a text line in log file quit exit exit program [=] session log e:\\proxspace\\pm3/.proxmark3/logs/log_20210825.txt --------------------------------------------------------------------------------------- auto available offline: no run lf search / hf search / data plot / data save",
|
||||
"description": "help use `<command> help` for details of a command prefs { edit client/device preferences... } -------- ----------------------- technology ----------------------- analyse { analyse utils... } data { plot window / data buffer manipulation... } emv { emv iso-14443 / iso-7816... } hf { high frequency commands... } hw { hardware commands... } lf { low frequency commands... } nfc { nfc commands... } reveng { crc calculations from reveng software... } smart { smart card iso-7816 commands... } script { scripting commands... } trace { trace manipulation... } wiegand { wiegand format manipulation... } -------- ----------------------- general ----------------------- clear clear screen hints turn hints on / off msleep add a pause in milliseconds rem add a text line in log file quit exit exit program [=] session log e:\\proxspace\\pm3/.proxmark3/logs/log_20210830.txt --------------------------------------------------------------------------------------- auto available offline: no run lf search / hf search / data plot / data save",
|
||||
"notes": [
|
||||
"auto"
|
||||
],
|
||||
|
|
@ -5150,7 +5150,7 @@
|
|||
"description": "checks and prints mifare application directory (mad)",
|
||||
"notes": [
|
||||
"hf mfp mad -> shows mad if exists",
|
||||
"hf mfp mad -a e103 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows ndef data if exists"
|
||||
"hf mfp mad --aid e103 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> read and print ndef data from mad aid if exists"
|
||||
],
|
||||
"offline": false,
|
||||
"options": [
|
||||
|
|
@ -5170,7 +5170,7 @@
|
|||
"notes": [
|
||||
"hf mfp ndefread -> shows ndef data",
|
||||
"hf mfp ndefread -vv -> shows ndef parsed and raw data",
|
||||
"hf mfp ndefread -a e103 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows ndef data with custom aid and key"
|
||||
"hf mfp ndefread --aid e103 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows ndef data with custom aid and key"
|
||||
],
|
||||
"offline": false,
|
||||
"options": [
|
||||
|
|
@ -9313,7 +9313,7 @@
|
|||
"notes": [
|
||||
"hf mfp ndefread -> shows ndef data",
|
||||
"hf mfp ndefread -vv -> shows ndef parsed and raw data",
|
||||
"hf mfp ndefread -a e103 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows ndef data with custom aid and key"
|
||||
"hf mfp ndefread --aid e103 -k d3f7d3f7d3f7d3f7d3f7d3f7d3f7d3f7 -> shows ndef data with custom aid and key"
|
||||
],
|
||||
"offline": false,
|
||||
"options": [
|
||||
|
|
@ -10000,6 +10000,6 @@
|
|||
"metadata": {
|
||||
"commands_extracted": 589,
|
||||
"extracted_by": "PM3Help2JSON v1.00",
|
||||
"extracted_on": "2021-08-25T11:37:52"
|
||||
"extracted_on": "2021-08-30T09:35:54"
|
||||
}
|
||||
}
|
||||
|
|
@ -461,15 +461,15 @@ Check column "offline" for their availability.
|
|||
|`hf mfp help `|Y |`This help`
|
||||
|`hf mfp info `|N |`Info about Mifare Plus tag`
|
||||
|`hf mfp wrp `|N |`Write Perso command`
|
||||
|`hf mfp initp `|N |`Fills all the card's keys`
|
||||
|`hf mfp initp `|N |`Fill all the card's keys in SL0 mode`
|
||||
|`hf mfp commitp `|N |`Move card to SL1 or SL3 mode`
|
||||
|`hf mfp auth `|N |`Authentication`
|
||||
|`hf mfp rdbl `|N |`Read blocks`
|
||||
|`hf mfp rdsc `|N |`Read sectors`
|
||||
|`hf mfp wrbl `|N |`Write blocks`
|
||||
|`hf mfp chk `|N |`Check keys`
|
||||
|`hf mfp mad `|N |`Checks and prints MAD`
|
||||
|`hf mfp ndefread `|N |`Prints NDEF records from card`
|
||||
|`hf mfp mad `|N |`Check and print MAD`
|
||||
|`hf mfp ndefread `|N |`Read and print NDEF records from card`
|
||||
|
||||
|
||||
### hf mfu
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue