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

And make style

Browse source
This commit is contained in:
AloneLiberty 2023-03-26 18:05:11 +03:00
commit d10d8c0039
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
armsrc/mifarecmd.c
View file

@ -497,7 +497,7 @@ void MifareWriteBlock(uint8_t arg0, uint8_t arg1, uint8_t *datain) {
retval = 1;
OUT:
OUT:
crypto1_deinit(pcs);
reply_mix(CMD_ACK, retval, 0, 0, 0, 0);

2
armsrc/mifareutil.c
View file

@ -183,7 +183,7 @@ int mifare_classic_authex_2(struct Crypto1State *pcs, uint32_t uid, uint8_t bloc
// Generate (encrypted) nr+parity by loading it into the cipher (Nr)
uint32_t pos;
uint8_t par[1] = {0x00};
uint8_t par[1] = {0x00};
uint8_t mf_nr_ar[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
for (pos = 0; pos < 4; pos++) {
mf_nr_ar[pos] = crypto1_byte(pcs, nr[pos], 0) ^ nr[pos];

10
client/src/cmdhfmf.c
View file

@ -633,7 +633,7 @@ static int CmdHF14AMfWrBl(const char *Cmd) {
PrintAndLogEx(SUCCESS, "Write ( " _GREEN_("ok") " )");
PrintAndLogEx(HINT, "try `" _YELLOW_("hf mf rdbl") "` to verify");
} else if (status == PM3_ETEAROFF) {
return status;
return status;
} else {
PrintAndLogEx(FAILED, "Write ( " _RED_("fail") " )");
// suggest the opposite keytype than what was used.
@ -7855,7 +7855,7 @@ static int CmdHF14AGen4_GDM_SetBlk(const char *Cmd) {
PrintAndLogEx(HINT, "try `" _YELLOW_("hf mf rdbl") "` to verify");
} else if (resp.status == PM3_ETEAROFF) {
return resp.status;
} else {
} else {
PrintAndLogEx(FAILED, "Write ( " _RED_("fail") " )");
PrintAndLogEx(HINT, "Maybe access rights? Try specify keytype `" _YELLOW_("hf mf gdmsetblk -%c ...") "` instead", (keytype == MF_KEY_A) ? 'b' : 'a');
}
@ -8007,7 +8007,7 @@ static int CmdHF14AMfValue(const char *Cmd) {
}
if (resp.oldarg[0] & 0xFF) {
// all ok so set flag to read current value
// all ok so set flag to read current value
getval = true;
PrintAndLogEx(SUCCESS, "Update ( " _GREEN_("success") " )");
} else {
@ -8040,7 +8040,7 @@ static int CmdHF14AMfValue(const char *Cmd) {
}
int status = resp.oldarg[0];
if (status) {
// all ok so set flag to read current value
// all ok so set flag to read current value
getval = true;
PrintAndLogEx(SUCCESS, "Update ( " _GREEN_("success") " )");
} else if (status == PM3_ETEAROFF) {
@ -8137,7 +8137,7 @@ static command_t CommandTable[] = {
{"gsave", CmdHF14AGen4Save, IfPm3Iso14443a, "Save dump from card into file or emulator"},
{"gsetblk", CmdHF14AGen4SetBlk, IfPm3Iso14443a, "Write block to card"},
{"gview", CmdHF14AGen4View, IfPm3Iso14443a, "View card"},
{"-----------", CmdHelp, IfPm3Iso14443a, "-------------------- " _CYAN_("magic gen4 GDM") " --------------------------"},
{"-----------", CmdHelp, IfPm3Iso14443a, "-------------------- " _CYAN_("magic gen4 GDM") " --------------------------"},
{"gdmcfg", CmdHF14AGen4_GDM_Cfg, IfPm3Iso14443a, "Read config block from card"},
{"gdmsetcfg", CmdHF14AGen4_GDM_SetCfg, IfPm3Iso14443a, "Write config block to card"},
{"gdmsetblk", CmdHF14AGen4_GDM_SetBlk, IfPm3Iso14443a, "Write block to card"},

4
doc/commands.json
View file

@ -4889,7 +4889,7 @@
"offline": false,
"options": [
"-h, --help This help",
"-r, --reset reset card",
"-r, --reset Reset card",
"-u, --uid <hex> New UID (4 hex bytes)"
],
"usage": "hf mf supercard [-hr] [-u <hex>]"
@ -11989,6 +11989,6 @@
"metadata": {
"commands_extracted": 754,
"extracted_by": "PM3Help2JSON v1.00",
"extracted_on": "2023-03-26T13:15:37"
"extracted_on": "2023-03-26T15:04:49"
}
}