From 910c4d8c92b85ca0bb6ce70499b86fddba44f0c4 Mon Sep 17 00:00:00 2001 From: merlokk <807634+merlokk@users.noreply.github.com> Date: Mon, 6 Nov 2023 00:29:28 +0200 Subject: [PATCH] make style --- .vscode/extensions.json | 1 - client/src/cmdhficlass.c | 6 +++--- client/src/cmdhfmfu.c | 6 +++--- client/src/cmdnfc.c | 8 ++++---- client/src/mifare/gen4.h | 2 +- client/src/mifare/mifarehost.c | 4 ++-- client/src/pm3line_vocabulary.h | 1 + doc/commands.json | 28 ++++++++++++++++++++++------ doc/commands.md | 1 + 9 files changed, 37 insertions(+), 20 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 85b3997e2..e9b75675f 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -3,7 +3,6 @@ // for the documentation about the extensions.json format "recommendations": [ "ms-vscode.cpptools", - "austin.code-gnu-global", "marus25.cortex-debug", "augustocdias.tasks-shell-input" ] diff --git a/client/src/cmdhficlass.c b/client/src/cmdhficlass.c index b8e80aaa4..4c60438df 100644 --- a/client/src/cmdhficlass.c +++ b/client/src/cmdhficlass.c @@ -1324,7 +1324,7 @@ static int CmdHFiClassESetBlk(const char *Cmd) { static bool iclass_detect_new_pacs(uint8_t *d) { uint8_t n = 0; while (n++ < (PICOPASS_BLOCK_SIZE / 2)) { - if (d[n] && + if (d[n] && d[n + 1] == 0xA6) { return true; } @@ -1332,7 +1332,7 @@ static bool iclass_detect_new_pacs(uint8_t *d) { return false; } -// block 7 decoder for PACS +// block 7 decoder for PACS static int iclass_decode_credentials_new_pacs(uint8_t *d) { uint8_t offset = 0; @@ -1349,7 +1349,7 @@ static int iclass_decode_credentials_new_pacs(uint8_t *d) { return PM3_EMALLOC; } - uint8_t n = PICOPASS_BLOCK_SIZE - offset - 2; + uint8_t n = PICOPASS_BLOCK_SIZE - offset - 2; byte_2_binstr(binstr, d + offset + 2, n); PrintAndLogEx(NORMAL, ""); diff --git a/client/src/cmdhfmfu.c b/client/src/cmdhfmfu.c index 860744220..6b55875f7 100644 --- a/client/src/cmdhfmfu.c +++ b/client/src/cmdhfmfu.c @@ -70,7 +70,7 @@ static uint8_t default_pwd_pack[][4] = { }; static uint64_t UL_TYPES_ARRAY[] = { - MFU_TT_UNKNOWN, MFU_TT_UL, + MFU_TT_UNKNOWN, MFU_TT_UL, MFU_TT_UL_C, MFU_TT_UL_EV1_48, MFU_TT_UL_EV1_128, MFU_TT_NTAG, MFU_TT_NTAG_203, MFU_TT_NTAG_210, @@ -79,7 +79,7 @@ static uint64_t UL_TYPES_ARRAY[] = { MFU_TT_MY_D, MFU_TT_MY_D_NFC, MFU_TT_MY_D_MOVE, MFU_TT_MY_D_MOVE_NFC, MFU_TT_MY_D_MOVE_LEAN, MFU_TT_NTAG_I2C_1K, - MFU_TT_NTAG_I2C_2K, MFU_TT_NTAG_I2C_1K_PLUS, + MFU_TT_NTAG_I2C_2K, MFU_TT_NTAG_I2C_1K_PLUS, MFU_TT_NTAG_I2C_2K_PLUS, MFU_TT_FUDAN_UL, MFU_TT_NTAG_213_F, MFU_TT_NTAG_216_F, MFU_TT_UL_EV1, MFU_TT_UL_NANO_40, @@ -1891,7 +1891,7 @@ static int CmdHF14AMfUInfo(const char *Cmd) { } // Read signature - if ((tagtype & (MFU_TT_UL_EV1_48 | MFU_TT_UL_EV1_128 | MFU_TT_UL_EV1 | MFU_TT_UL_NANO_40 | + if ((tagtype & (MFU_TT_UL_EV1_48 | MFU_TT_UL_EV1_128 | MFU_TT_UL_EV1 | MFU_TT_UL_NANO_40 | MFU_TT_NTAG_210u | MFU_TT_NTAG_213 | MFU_TT_NTAG_213_F | MFU_TT_NTAG_213_C | MFU_TT_NTAG_213_TT | MFU_TT_NTAG_215 | MFU_TT_NTAG_216 | MFU_TT_NTAG_216_F | MFU_TT_NTAG_I2C_1K | MFU_TT_NTAG_I2C_2K | MFU_TT_NTAG_I2C_1K_PLUS | MFU_TT_NTAG_I2C_2K_PLUS))) { diff --git a/client/src/cmdnfc.c b/client/src/cmdnfc.c index 4e827a32b..1096dec8f 100644 --- a/client/src/cmdnfc.c +++ b/client/src/cmdnfc.c @@ -113,12 +113,12 @@ static int CmdNfcDecode(const char *Cmd) { return res; } - uint8_t *tmp = dump; + uint8_t *tmp = dump; // if not MIFARE Classic default sizes, assume its Ultralight/NTAG - if ( bytes_read != MIFARE_4K_MAX_BYTES - && bytes_read != MIFARE_2K_MAX_BYTES - && bytes_read != MIFARE_1K_MAX_BYTES + if ( bytes_read != MIFARE_4K_MAX_BYTES + && bytes_read != MIFARE_2K_MAX_BYTES + && bytes_read != MIFARE_1K_MAX_BYTES && bytes_read != MIFARE_MINI_MAX_BYTES) { uint8_t **pd = &tmp; diff --git a/client/src/mifare/gen4.h b/client/src/mifare/gen4.h index bc4dcfb4f..3a2ab0947 100644 --- a/client/src/mifare/gen4.h +++ b/client/src/mifare/gen4.h @@ -34,4 +34,4 @@ #define GEN4_CMD_SET_CONFIG_PERMANENT 0xF1 #define GEN4_CMD_CHANGE_PASSWORD 0xFE -#endif \ No newline at end of file +#endif diff --git a/client/src/mifare/mifarehost.c b/client/src/mifare/mifarehost.c index b6fd7e22b..7ff786832 100644 --- a/client/src/mifare/mifarehost.c +++ b/client/src/mifare/mifarehost.c @@ -1208,7 +1208,7 @@ static int mfG4ExCommand(uint8_t cmd, uint8_t *pwd, uint8_t *data, size_t datale if (verbose) PrintAndLogEx(ERR, "No card in the field."); return PM3_ETIMEOUT; } - + iso14a_card_select_t card; memcpy(&card, (iso14a_card_select_t *)resp.data.asBytes, sizeof(iso14a_card_select_t)); if (verbose) { @@ -1223,7 +1223,7 @@ static int mfG4ExCommand(uint8_t cmd, uint8_t *pwd, uint8_t *data, size_t datale if (WaitForResponseTimeout(CMD_ACK, &resp, 1500)) { resplen = resp.oldarg[0]; - + if (!resplen) { if (verbose) PrintAndLogEx(ERR, "No card response."); return PM3_EFAILED; diff --git a/client/src/pm3line_vocabulary.h b/client/src/pm3line_vocabulary.h index 858267278..a0fcee232 100644 --- a/client/src/pm3line_vocabulary.h +++ b/client/src/pm3line_vocabulary.h @@ -366,6 +366,7 @@ const static vocabulary_t vocabulary[] = { { 0, "hf mf gen3uid" }, { 0, "hf mf gen3blk" }, { 0, "hf mf gen3freeze" }, + { 0, "hf mf ginfo" }, { 0, "hf mf ggetblk" }, { 0, "hf mf gload" }, { 0, "hf mf gsave" }, diff --git a/doc/commands.json b/doc/commands.json index 4cb9c4623..35bb46ec4 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -279,6 +279,7 @@ "command": "data bmap", "description": "Breaks down a hex value to binary according a template data bmap -d 16 -m 4,4 This will give two rows each with four bits", "notes": [ + "data bmap -d 3B", "data bmap -d 3B -m 2,5,1" ], "offline": true, @@ -3026,10 +3027,10 @@ }, "hf iclass configcard": { "command": "hf iclass configcard", - "description": "Manage reader configuration card via Cardhelper, The generated config card will be uploaded to device emulator memory. You can start simulating `hf iclass sim -t 3` or use the emul commands", + "description": "Manage reader configuration card via Cardhelper or internal database, The generated config card will be uploaded to device emulator memory. You can start simulating `hf iclass sim -t 3` or use the emul commands", "notes": [ - "hf iclass configcard -l -> download config card settings", - "hf iclass configcard -p -> print all config cards", + "hf iclass configcard -l -> download config card settings from cardhelper", + "hf iclass configcard -p -> print all config cards in the database", "hf iclass configcard --ci 1 -> view config card setting in slot 1", "hf iclass configcard -g --ci 0 -> generate config file from slot 0" ], @@ -4553,6 +4554,21 @@ ], "usage": "hf mf ggetblk [-hv] -b [-p ]" }, + "hf mf ginfo": { + "command": "hf mf ginfo", + "description": "Read info about magic gen4 GTU card.", + "notes": [ + "hf mf ginfo -> get info with default password 00000000", + "hf mf ginfo --pwd 01020304 -> get info with password" + ], + "offline": false, + "options": [ + "-h, --help This help", + "-v, --verbose verbose output", + "-p, --pwd password 4bytes" + ], + "usage": "hf mf ginfo [-hv] [-p ]" + }, "hf mf gload": { "command": "hf mf gload", "description": "Load magic gen4 gtu card with data from (bin/eml/json) dump file or from emulator memory.", @@ -8939,7 +8955,7 @@ "-1, --ht1 Card type Hitag 1", "-2, --ht2 Card type Hitag 2", "-s, --hts Card type Hitag S", - "-m, --htm Card type Hitag \u03bc" + "-m, --htm Card type Hitag \u041e\u0458" ], "usage": "lf hitag eload [-h12sm] -f " }, @@ -12015,8 +12031,8 @@ } }, "metadata": { - "commands_extracted": 696, + "commands_extracted": 697, "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2023-10-30T12:11:34" + "extracted_on": "2023-11-05T22:22:55" } } \ No newline at end of file diff --git a/doc/commands.md b/doc/commands.md index 49d34875d..0ff13a82e 100644 --- a/doc/commands.md +++ b/doc/commands.md @@ -529,6 +529,7 @@ Check column "offline" for their availability. |`hf mf gen3uid `|N |`Set UID without changing manufacturer block` |`hf mf gen3blk `|N |`Overwrite manufacturer block` |`hf mf gen3freeze `|N |`Perma lock UID changes. irreversible` +|`hf mf ginfo `|N |`Info about configuration of the card` |`hf mf ggetblk `|N |`Read block from card` |`hf mf gload `|N |`Load dump to card` |`hf mf gsave `|N |`Save dump from card into file or emulator`