diff --git a/client/src/pm3line_vocabulory.h b/client/src/pm3line_vocabulory.h index d71e90895..4ef0c0771 100644 --- a/client/src/pm3line_vocabulory.h +++ b/client/src/pm3line_vocabulory.h @@ -63,7 +63,6 @@ const static vocabulory_t vocabulory[] = { { 1, "analyse crc" }, { 1, "analyse chksum" }, { 1, "analyse dates" }, - { 1, "analyse tea" }, { 1, "analyse lfsr" }, { 1, "analyse a" }, { 1, "analyse nuid" }, diff --git a/doc/commands.json b/doc/commands.json index ca5b13fb5..56e392eaf 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -97,7 +97,7 @@ }, "analyse help": { "command": "analyse help", - "description": "help this help lcr generate final byte for xor lrc crc stub method for crc evaluations chksum checksum with adding, masking and one's complement dates look for datestamps in a given array of bytes tea crypto tea test lfsr lfsr tests a num bits test nuid create nuid from 7byte uid demodbuff load binary string to demodbuffer freq calc wave lengths foo muxer units convert etu <> us <> ssp_clk (3.39mhz) --------------------------------------------------------------------------------------- analyse lcr available offline: yes specifying the bytes of a uid with a known lrc will find the last byte value needed to generate that lrc with a rolling xor. all bytes should be specified in hex.", + "description": "help this help lcr generate final byte for xor lrc crc stub method for crc evaluations chksum checksum with adding, masking and one's complement dates look for datestamps in a given array of bytes lfsr lfsr tests a num bits test nuid create nuid from 7byte uid demodbuff load binary string to demodbuffer freq calc wave lengths foo muxer units convert etu <> us <> ssp_clk (3.39mhz) --------------------------------------------------------------------------------------- analyse lcr available offline: yes specifying the bytes of a uid with a known lrc will find the last byte value needed to generate that lrc with a rolling xor. all bytes should be specified in hex.", "notes": [ "analyse lcr -d 04008064ba -> target (ba) requires final lrc xor byte value: 5a" ], @@ -136,19 +136,6 @@ ], "usage": "analyse nuid [-ht] [-d ]" }, - "analyse tea": { - "command": "analyse tea", - "description": "crypto tea self tests", - "notes": [ - "analyse tea -d 1122334455667788" - ], - "offline": true, - "options": [ - "-h, --help this help", - "-d, --data bytes to encrypt ( 8 hex bytes )" - ], - "usage": "analyse tea [-h] -d " - }, "analyse units": { "command": "analyse units", "description": "experiments of unit conversions found in hf. etu (1/13.56mhz), us or ssp_clk (1/3.39mhz)", @@ -2322,26 +2309,29 @@ }, "hf gallagher clone": { "command": "hf gallagher clone", - "description": "clone gallagher credentials to a writable desfire card specify site key is required if using non-default key key, lengths for the different crypto: des 8 bytes 2tdea or aes 16 bytes 3tdea 24 bytes aid id, default finds lowest available in range 0x2?81f4, where 0 <= ? <= 0xb.", + "description": "clone gallagher credentials to a writable desfire card specify site key is required if using non-default key key, lengths for the different crypto: des 8 bytes 2tdea or aes 16 bytes 3tdea 24 bytes aid, default finds lowest available in range 0x??81f4, where ?? >= 0x20.", "notes": [ "hf gallagher clone --rc 1 --fc 22 --cn 3333 --il 4 --sitekey 00112233445566778899aabbccddeeff" ], "offline": false, "options": [ "-h, --help this help", - "-n, --keynum key number [default = 0]", - "-t, --algo crypt algo: des, 2tdea, 3tdea, aes", - "-k, --key key for authentication to the picc", + "-n, --keynum picc key number [default = 0]", + "-t, --algo picc crypt algo: des, 2tdea, 3tdea, aes", + "-k, --key key for authentication to the picc to create applications (hex 8(des), 16(2tdea or aes) or 24(3tdea) bytes)", "--rc region code. 4 bits max", "--fc facility code. 2 bytes max", "--cn card number. 3 bytes max", "--il issue level. 4 bits max", - "--aid application id to write (3 bytes)", + "--aid application id to write (3 bytes) [default automatically chooses an aid]", "--sitekey site key to compute diversified keys (16 bytes)", + "--cadkey custom aes key 0 to modify the card application directory (16 bytes)", + "--nocadupdate don't modify the card application directory (only creates the app)", + "--noappcreate don't create the application (only modifies the cad)", "--apdu show apdu requests and responses", "-v, --verbose verbose mode" ], - "usage": "hf gallagher clone [-hv] [-n ] [-t ] [-k ] --rc --fc --cn --il [--aid ] [--sitekey ] [--apdu]" + "usage": "hf gallagher clone [-hv] [-n ] [-t ] [-k ] --rc --fc --cn --il [--aid ] [--sitekey ] [--cadkey ] [--nocadupdate] [--noappcreate] [--apdu]" }, "hf gallagher delete": { "command": "hf gallagher delete", @@ -2354,10 +2344,13 @@ "-h, --help this help", "--aid application id to delete (3 bytes)", "--sitekey site key to compute diversified keys (16 bytes)", + "--cadkey custom aes key 0 to modify the card application directory (16 bytes)", + "--nocadupdate don't modify the card application directory (only deletes the app)", + "--noappdelete don't delete the application (only modifies the cad)", "--apdu show apdu requests and responses", "-v, --verbose verbose mode" ], - "usage": "hf gallagher delete [-hv] --aid [--sitekey ] [--apdu]" + "usage": "hf gallagher delete [-hv] --aid [--sitekey ] [--cadkey ] [--nocadupdate] [--noappdelete] [--apdu]" }, "hf gallagher diversifykey": { "command": "hf gallagher diversifykey", @@ -10210,8 +10203,8 @@ } }, "metadata": { - "commands_extracted": 599, + "commands_extracted": 598, "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2022-01-11T01:15:20" + "extracted_on": "2022-01-15T01:07:16" } } \ No newline at end of file diff --git a/doc/commands.md b/doc/commands.md index f585b71da..86eca7c06 100644 --- a/doc/commands.md +++ b/doc/commands.md @@ -74,7 +74,6 @@ Check column "offline" for their availability. |`analyse crc `|Y |`Stub method for CRC evaluations` |`analyse chksum `|Y |`Checksum with adding, masking and one's complement` |`analyse dates `|Y |`Look for datestamps in a given array of bytes` -|`analyse tea `|Y |`Crypto TEA test` |`analyse lfsr `|Y |`LFSR tests` |`analyse a `|Y |`num bits test` |`analyse nuid `|Y |`create NUID from 7byte UID`