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

Fixed iclass info available in offline mode

Browse source 
Fixed iclass info available in offline mode
This commit is contained in:
Antiklesys 2023-10-15 18:27:25 +08:00
commit 22b85c74d8
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -20,7 +20,7 @@ This project uses the changelog in accordance with [keepchangelog](http://keepac
- Added `hf iclass creditepurse` command to allow crediting the epurse debit value (@nvx) - Added `hf iclass creditepurse` command to allow crediting the epurse debit value (@nvx)
- Modified `hf iclass configcard` to only support online mode (@Antiklesys) - Modified `hf iclass configcard` to only support online mode (@Antiklesys)
- Modified `hf iclass configcard` command to generate config cards without a cardhelper module by porting the contents of blocks 6 & 7 from nfc-iclass (@Antiklesys) - Modified `hf iclass configcard` command to generate config cards without a cardhelper module by porting the contents of blocks 6 & 7 from nfc-iclass (@Antiklesys)
- Fixed multiple online iclass commands showing incorrectly in offline mode (@Antiklesys) - Fixed `hf iclass info` command showing incorrectly in offline mode (@Antiklesys)
## [Raccoon.4.17140][2023-09-09] ## [Raccoon.4.17140][2023-09-09]
- Changed text and adjust pm3_test case for mf_aes_brute (@doegox) - Changed text and adjust pm3_test case for mf_aes_brute (@doegox)

4
client/src/cmdhficlass.c
View file

@ -4472,7 +4472,7 @@ static int CmdHFiClassSAM(const char *Cmd) {
static command_t CommandTable[] = { static command_t CommandTable[] = {
{"help", CmdHelp, AlwaysAvailable, "This help"}, {"help", CmdHelp, AlwaysAvailable, "This help"},
{"list", CmdHFiClassList, IfPm3Iclass, "List iclass history"}, {"list", CmdHFiClassList, AlwaysAvailable, "List iclass history"},
{"-----------", CmdHelp, AlwaysAvailable, "--------------------- " _CYAN_("general") " ---------------------"}, {"-----------", CmdHelp, AlwaysAvailable, "--------------------- " _CYAN_("general") " ---------------------"},
// {"clone", CmdHFiClassClone, IfPm3Iclass, "Create a HID credential to Picopass / iCLASS tag"}, // {"clone", CmdHFiClassClone, IfPm3Iclass, "Create a HID credential to Picopass / iCLASS tag"},
{"dump", CmdHFiClassDump, IfPm3Iclass, "Dump Picopass / iCLASS tag to file"}, {"dump", CmdHFiClassDump, IfPm3Iclass, "Dump Picopass / iCLASS tag to file"},
@ -4498,7 +4498,7 @@ static command_t CommandTable[] = {
{"-----------", CmdHelp, AlwaysAvailable, "---------------------- " _CYAN_("utils") " ----------------------"}, {"-----------", CmdHelp, AlwaysAvailable, "---------------------- " _CYAN_("utils") " ----------------------"},
{"configcard", CmdHFiClassConfigCard, IfPm3Iclass, "Reader configuration card"}, {"configcard", CmdHFiClassConfigCard, IfPm3Iclass, "Reader configuration card"},
{"calcnewkey", CmdHFiClassCalcNewKey, AlwaysAvailable, "Calc diversified keys (blocks 3 & 4) to write new keys"}, {"calcnewkey", CmdHFiClassCalcNewKey, AlwaysAvailable, "Calc diversified keys (blocks 3 & 4) to write new keys"},
{"encode", CmdHFiClassEncode, IfPm3Iclass, "Encode binary wiegand to block 7"}, {"encode", CmdHFiClassEncode, AlwaysAvailable, "Encode binary wiegand to block 7"},
{"encrypt", CmdHFiClassEncryptBlk, AlwaysAvailable, "Encrypt given block data"}, {"encrypt", CmdHFiClassEncryptBlk, AlwaysAvailable, "Encrypt given block data"},
{"decrypt", CmdHFiClassDecrypt, AlwaysAvailable, "Decrypt given block data or tag dump file" }, {"decrypt", CmdHFiClassDecrypt, AlwaysAvailable, "Decrypt given block data or tag dump file" },
{"managekeys", CmdHFiClassManageKeys, AlwaysAvailable, "Manage keys to use with iclass commands"}, {"managekeys", CmdHFiClassManageKeys, AlwaysAvailable, "Manage keys to use with iclass commands"},

4
client/src/pm3line_vocabulary.h
View file

@ -267,7 +267,7 @@ const static vocabulary_t vocabulary[] = {
{ 1, "hf jooki encode" }, { 1, "hf jooki encode" },
{ 0, "hf jooki sim" }, { 0, "hf jooki sim" },
{ 1, "hf iclass help" }, { 1, "hf iclass help" },
{ 0, "hf iclass list" }, { 1, "hf iclass list" },
{ 0, "hf iclass dump" }, { 0, "hf iclass dump" },
{ 0, "hf iclass info" }, { 0, "hf iclass info" },
{ 0, "hf iclass rdbl" }, { 0, "hf iclass rdbl" },
@ -287,7 +287,7 @@ const static vocabulary_t vocabulary[] = {
{ 0, "hf iclass eview" }, { 0, "hf iclass eview" },
{ 0, "hf iclass configcard" }, { 0, "hf iclass configcard" },
{ 1, "hf iclass calcnewkey" }, { 1, "hf iclass calcnewkey" },
{ 0, "hf iclass encode" }, { 1, "hf iclass encode" },
{ 1, "hf iclass encrypt" }, { 1, "hf iclass encrypt" },
{ 1, "hf iclass decrypt" }, { 1, "hf iclass decrypt" },
{ 1, "hf iclass managekeys" }, { 1, "hf iclass managekeys" },

4
doc/commands.json
View file

@ -3120,7 +3120,7 @@
"hf iclass encode -w H10301 --fc 31 --cn 337 --ki 0 -> FC 31 CN 337 (H10301)", "hf iclass encode -w H10301 --fc 31 --cn 337 --ki 0 -> FC 31 CN 337 (H10301)",
"hf iclass encode --bin 10001111100000001010100011 --ki 0 --elite -> FC 31 CN 337 (H10301), writing w elite key" "hf iclass encode --bin 10001111100000001010100011 --ki 0 --elite -> FC 31 CN 337 (H10301), writing w elite key"
], ],
"offline": false, "offline": true,
"options": [ "options": [
"-h, --help This help", "-h, --help This help",
"--bin <bin> Binary string i.e 0001001001", "--bin <bin> Binary string i.e 0001001001",
@ -3220,7 +3220,7 @@
"hf iclass list --frame -> show frame delay times", "hf iclass list --frame -> show frame delay times",
"hf iclass list -1 -> use trace buffer" "hf iclass list -1 -> use trace buffer"
], ],
"offline": false, "offline": true,
"options": [ "options": [
"-h, --help This help", "-h, --help This help",
"-1, --buffer use data from trace buffer", "-1, --buffer use data from trace buffer",

4
doc/commands.md
View file

@ -406,7 +406,7 @@ Check column "offline" for their availability.
|command |offline |description |command |offline |description
|------- |------- |----------- |------- |------- |-----------
|`hf iclass help `|Y |`This help` |`hf iclass help `|Y |`This help`
|`hf iclass list `|N |`List iclass history` |`hf iclass list `|Y |`List iclass history`
|`hf iclass dump `|N |`Dump Picopass / iCLASS tag to file` |`hf iclass dump `|N |`Dump Picopass / iCLASS tag to file`
|`hf iclass info `|N |`Tag information` |`hf iclass info `|N |`Tag information`
|`hf iclass rdbl `|N |`Read Picopass / iCLASS block` |`hf iclass rdbl `|N |`Read Picopass / iCLASS block`
@ -426,7 +426,7 @@ Check column "offline" for their availability.
|`hf iclass eview `|N |`View emulator memory` |`hf iclass eview `|N |`View emulator memory`
|`hf iclass configcard `|N |`Reader configuration card` |`hf iclass configcard `|N |`Reader configuration card`
|`hf iclass calcnewkey `|Y |`Calc diversified keys (blocks 3 & 4) to write new keys` |`hf iclass calcnewkey `|Y |`Calc diversified keys (blocks 3 & 4) to write new keys`
|`hf iclass encode `|N |`Encode binary wiegand to block 7` |`hf iclass encode `|Y |`Encode binary wiegand to block 7`
|`hf iclass encrypt `|Y |`Encrypt given block data` |`hf iclass encrypt `|Y |`Encrypt given block data`
|`hf iclass decrypt `|Y |`Decrypt given block data or tag dump file` |`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 managekeys `|Y |`Manage keys to use with iclass commands`