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

style

Browse source
This commit is contained in:
iceman1001 2023-07-26 23:50:12 +02:00
commit 123ef14667
9 changed files with 819 additions and 806 deletions
Download patch file Download diff file Expand all files Collapse all files

8
armsrc/mifarecmd.c
View file

@ -75,7 +75,7 @@ int16_t mifare_cmd_readblocks(uint8_t key_auth_cmd, uint8_t *key, uint8_t read_c
iso14443a_setup(FPGA_HF_ISO14443A_READER_LISTEN);
clear_trace();
set_tracing(true);
uint32_t timeout = iso14a_get_timeout();
LED_A_ON();
@ -97,7 +97,7 @@ int16_t mifare_cmd_readblocks(uint8_t key_auth_cmd, uint8_t *key, uint8_t read_c
};
// frame waiting time (FWT) in 1/fc
uint32_t fwt = 256 * 16 * (1 << 6);
uint32_t fwt = 256 * 16 * (1 << 6);
iso14a_set_timeout(fwt / (8 * 16));
for (uint8_t i = 0; i < count; i++) {
@ -2080,7 +2080,7 @@ int MifareECardLoad(uint8_t sectorcnt, uint8_t keytype) {
// increase time-out. Magic card etc are slow
uint32_t timeout = iso14a_get_timeout();
// frame waiting time (FWT) in 1/fc
uint32_t fwt = 256 * 16 * (1 << 7);
uint32_t fwt = 256 * 16 * (1 << 7);
iso14a_set_timeout(fwt / (8 * 16));
for (uint8_t s = 0; s < sectorcnt; s++) {
@ -2349,7 +2349,7 @@ void MifareCGetBlock(uint32_t arg0, uint32_t arg1, uint8_t *datain) {
// increase time-out. Magic card etc are slow
uint32_t timeout = iso14a_get_timeout();
// frame waiting time (FWT) in 1/fc
uint32_t fwt = 256 * 16 * (1 << 7);
uint32_t fwt = 256 * 16 * (1 << 7);
iso14a_set_timeout(fwt / (8 * 16));
//loop doesn't loop just breaks out if error or done

8
client/src/cmdhf15.c
View file

@ -790,17 +790,17 @@ static int NxpSysInfo(uint8_t *uid) {
PrintAndLogEx(INFO, "--- " _CYAN_("NXP Sysinfo"));
PrintAndLogEx(INFO, " raw... %s", sprint_hex(recv, 8));
PrintAndLogEx(INFO, " " _CYAN_("Password protection configuration:"));
PrintAndLogEx(INFO, " * Page L read%s password protected", ((recv[2] & 0x01) ? "" : _GREEN_(" not")));
PrintAndLogEx(INFO, " * Page L read%s password protected", ((recv[2] & 0x01) ? "" : _GREEN_(" not")));
PrintAndLogEx(INFO, " * Page L write%s password protected", ((recv[2] & 0x02) ? "" : _GREEN_(" not")));
PrintAndLogEx(INFO, " * Page H read%s password protected", ((recv[2] & 0x10) ? "" : _GREEN_(" not")));
PrintAndLogEx(INFO, " * Page H read%s password protected", ((recv[2] & 0x10) ? "" : _GREEN_(" not")));
PrintAndLogEx(INFO, " * Page H write%s password protected", ((recv[2] & 0x20) ? "" : _GREEN_(" not")));
PrintAndLogEx(INFO, " " _CYAN_("Lock bits:"));
// AFI lock bit
PrintAndLogEx(INFO, " * AFI%s locked", ((recv[3] & 0x01) ? "" : _GREEN_(" not")));
PrintAndLogEx(INFO, " * AFI%s locked", ((recv[3] & 0x01) ? "" : _GREEN_(" not")));
// EAS lock bit
PrintAndLogEx(INFO, " * EAS%s locked", ((recv[3] & 0x02) ? "" : _GREEN_(" not")));
PrintAndLogEx(INFO, " * EAS%s locked", ((recv[3] & 0x02) ? "" : _GREEN_(" not")));
// DSFID lock bit
PrintAndLogEx(INFO, " * DSFID%s locked", ((recv[3] & 0x03) ? "" : _GREEN_(" not")));

4
client/src/cmdhficlass.c
View file

@ -1082,7 +1082,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
} else {
dump = newdump;
}
if (verbose) {
print_picopass_header((picopass_hdr_t *) dump);
print_picopass_info((picopass_hdr_t *) dump);
@ -1094,7 +1094,7 @@ static int CmdHFiClassELoad(const char *Cmd) {
uint16_t bytes_sent = 0;
iclass_upload_emul(dump, bytes_read, &bytes_sent);
free(dump);
PrintAndLogEx(SUCCESS, "uploaded " _YELLOW_("%d") " bytes to emulator memory", bytes_sent);
PrintAndLogEx(SUCCESS, "uploaded " _YELLOW_("%d") " bytes to emulator memory", bytes_sent);
PrintAndLogEx(HINT, "You are ready to simulate. See " _YELLOW_("`hf iclass sim -h`"));
PrintAndLogEx(INFO, "Done!");
return PM3_SUCCESS;

14
client/src/cmdhfmf.c
View file

@ -1479,10 +1479,10 @@ static int CmdHF14AMfRestore(const char *Cmd) {
}
PrintAndLogEx(INFO, " %3d | %s| ( " _RED_("fail") " ) key " _YELLOW_("%c"),
blockno,
sprint_hex(bldata, sizeof(bldata)),
(kt == MF_KEY_A) ? 'A' : 'B'
);
blockno,
sprint_hex(bldata, sizeof(bldata)),
(kt == MF_KEY_A) ? 'A' : 'B'
);
} // end loop key types
} // end loop B
} // end loop S
@ -4352,7 +4352,7 @@ int CmdHF14AMfELoad(const char *Cmd) {
}
// ICEMAN: bug. if device has been using ICLASS commands,
// the device needs to load the HF fpga image. It takes 1.5 second.
// the device needs to load the HF fpga image. It takes 1.5 second.
set_fpga_mode(2);
uint8_t *data = NULL;
@ -7925,7 +7925,7 @@ static int CmdHF14AGen4Save(const char *Cmd) {
CLIParserFree(ctx);
// ICEMAN: bug. if device has been using ICLASS commands,
// the device needs to load the HF fpga image. It takes 1.5 second.
// the device needs to load the HF fpga image. It takes 1.5 second.
set_fpga_mode(2);
// validations
@ -8008,7 +8008,7 @@ static int CmdHF14AGen4Save(const char *Cmd) {
int res = mfG4GetBlock(pwd, i, dump + (i * MFBLOCK_SIZE), flags);
if (res != PM3_SUCCESS) {
PrintAndLogEx(NORMAL,"");
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(WARNING, "Can't get magic card block: %u. error=%d", i, res);
PrintAndLogEx(HINT, "Verify your card size, and try again or try another tag position");
free(dump);

2
client/src/cmdhw.c
View file

@ -1096,7 +1096,7 @@ int set_fpga_mode(uint8_t mode) {
return PM3_ETIMEOUT;
}
if (resp.status != PM3_SUCCESS) {
PrintAndLogEx(ERR, "failed to set FPGA mode");
PrintAndLogEx(ERR, "failed to set FPGA mode");
}
return resp.status;
}

2
client/src/cmdlfem4x50.c
View file

@ -215,7 +215,7 @@ int CmdEM4x50ELoad(const char *Cmd) {
// upload to emulator memory
em4x50_seteml(data, 0, DUMP_FILESIZE);
PrintAndLogEx(HINT, "You are ready to simulate. See " _YELLOW_("`lf em 4x50 sim -h`"));
PrintAndLogEx(HINT, "You are ready to simulate. See " _YELLOW_("`lf em 4x50 sim -h`"));
PrintAndLogEx(INFO, "Done!");
return PM3_SUCCESS;
}

1543
client/src/pm3line_vocabulory.h
View file

File diff suppressed because it is too large Load diff

21
doc/commands.json
View file

@ -1895,6 +1895,19 @@
],
"usage": "hf 15 sniff [-h]"
},
"hf 15 view": {
"command": "hf 15 view",
"description": "Print a ISO-15693 tag dump file (bin/eml/json)",
"notes": [
"hf 15 view -f hf-iclass-AA162D30F8FF12F1-dump.bin"
],
"offline": true,
"options": [
"-h, --help This help",
"-f, --file <fn> filename of dump (bin/eml/json)"
],
"usage": "hf 15 view [-h] -f <fn>"
},
"hf 15 wrbl": {
"command": "hf 15 wrbl",
"description": "Write block on ISO-15693 tag",
@ -4375,13 +4388,11 @@
"options": [
"-h, --help This help",
"--blk <dec> block number",
"-a input key type is key A (def)",
"-b input key type is key B",
"-d, --data <hex> bytes to write, 16 hex bytes",
"-k, --key <hex> key, 6 hex bytes",
"--force override warnings"
],
"usage": "hf mf gdmsetblk [-hab] --blk <dec> [-d <hex>] [-k <hex>] [--force]"
"usage": "hf mf gdmsetblk [-h] --blk <dec> [-d <hex>] [-k <hex>] [--force]"
},
"hf mf gdmsetcfg": {
"command": "hf mf gdmsetcfg",
@ -11768,8 +11779,8 @@
}
},
"metadata": {
"commands_extracted": 682,
"commands_extracted": 683,
"extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2023-07-23T09:59:37"
"extracted_on": "2023-07-26T21:49:57"
}
}

23
doc/commands.md
View file

@ -236,10 +236,12 @@ Check column "offline" for their availability.
|`hf 15 reader `|N |`Act like an ISO-15693 reader`
|`hf 15 restore `|N |`Restore from file to all memory pages of an ISO-15693 tag`
|`hf 15 samples `|N |`Acquire samples as reader (enables carrier, sends inquiry)`
|`hf 15 view `|Y |`Display content from tag dump file`
|`hf 15 wrbl `|N |`Write a block`
|`hf 15 sim `|N |`Fake an ISO-15693 tag`
|`hf 15 eload `|N |`Load image file into emulator to be used by 'sim' command`
|`hf 15 esave `|N |`Save emulator memory into image file`
|`hf 15 eview `|N |`View emulator memory`
|`hf 15 sim `|N |`Fake an ISO-15693 tag`
|`hf 15 slixwritepwd `|N |`Writes a password on a SLIX ISO-15693 tag`
|`hf 15 slixeasdisable `|N |`Disable EAS mode on SLIX ISO-15693 tag`
|`hf 15 slixeasenable `|N |`Enable EAS mode on SLIX ISO-15693 tag`
@ -247,7 +249,6 @@ Check column "offline" for their availability.
|`hf 15 slixprivacyenable`|N |`Enable privacy mode on SLIX ISO-15693 tag`
|`hf 15 passprotectafi `|N |`Password protect AFI - Cannot be undone`
|`hf 15 passprotecteas `|N |`Password protect EAS - Cannot be undone`
|`hf 15 wrbl `|N |`Write a block`
|`hf 15 findafi `|N |`Brute force AFI of an ISO-15693 tag`
|`hf 15 writeafi `|N |`Writes the AFI on an ISO-15693 tag`
|`hf 15 writedsfid `|N |`Writes the DSFID on an ISO-15693 tag`
@ -404,13 +405,14 @@ Check column "offline" for their availability.
|command |offline |description
|------- |------- |-----------
|`hf iclass help `|Y |`This help`
|`hf iclass list `|Y |`List iclass history`
|`hf iclass dump `|N |`Dump Picopass / iCLASS tag to file`
|`hf iclass info `|Y |`Tag information`
|`hf iclass list `|Y |`List iclass history`
|`hf iclass rdbl `|N |`Read Picopass / iCLASS block`
|`hf iclass reader `|N |`Act like a Picopass / iCLASS reader`
|`hf iclass restore `|N |`Restore a dump file onto a Picopass / iCLASS tag`
|`hf iclass sniff `|N |`Eavesdrop Picopass / iCLASS communication`
|`hf iclass view `|Y |`Display content from tag dump file`
|`hf iclass wrbl `|N |`Write Picopass / iCLASS block`
|`hf iclass chk `|N |`Check keys`
|`hf iclass loclass `|Y |`Use loclass to perform bruteforce reader attack`
@ -426,7 +428,6 @@ Check column "offline" for their availability.
|`hf iclass decrypt `|Y |`Decrypt given block data or tag dump file`
|`hf iclass managekeys `|Y |`Manage keys to use with iclass commands`
|`hf iclass permutekey `|Y |`Permute function from 'heart of darkness' paper`
|`hf iclass view `|Y |`Display content from tag dump file`
|`hf iclass sam `|N |`SAM tests`
@ -878,14 +879,14 @@ Check column "offline" for their availability.
|`lf em 4x05 help `|Y |`This help`
|`lf em 4x05 brute `|N |`Bruteforce password`
|`lf em 4x05 chk `|N |`Check passwords from dictionary`
|`lf em 4x05 demod `|Y |`demodulate a EM4x05/EM4x69 tag from the GraphBuffer`
|`lf em 4x05 dump `|N |`dump EM4x05/EM4x69 tag`
|`lf em 4x05 info `|N |`tag information EM4x05/EM4x69`
|`lf em 4x05 read `|N |`read word data from EM4x05/EM4x69`
|`lf em 4x05 demod `|Y |`Demodulate a EM4x05/EM4x69 tag from the GraphBuffer`
|`lf em 4x05 dump `|N |`Dump EM4x05/EM4x69 tag`
|`lf em 4x05 info `|N |`Tag information`
|`lf em 4x05 read `|N |`Read word data from EM4x05/EM4x69`
|`lf em 4x05 sniff `|Y |`Attempt to recover em4x05 commands from sample buffer`
|`lf em 4x05 unlock `|N |`execute tear off against EM4x05/EM4x69`
|`lf em 4x05 wipe `|N |`wipe EM4x05/EM4x69 tag`
|`lf em 4x05 write `|N |`write word data to EM4x05/EM4x69`
|`lf em 4x05 unlock `|N |`Execute tear off against EM4x05/EM4x69`
|`lf em 4x05 wipe `|N |`Wipe EM4x05/EM4x69 tag`
|`lf em 4x05 write `|N |`Write word data to EM4x05/EM4x69`
### lf em 4x50