RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 07:46:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
15960 commits 3 branches 14 tags 86 MiB
Commit graph

10054 commits

Author SHA1 Message Date
iceman1001 9af951c22b fix compiling 2022-12-04 09:27:13 +01:00
iceman1001 e3a6f8fe27 look up vigik service code 2022-12-03 21:11:29 +01:00
iceman1001 e4339bd846 wip - testing of a vigik annotater 2022-12-03 20:30:13 +01:00
iceman1001 80505ca268 vigik has some more 491x 2022-12-03 20:12:58 +01:00
iceman1001 a6c09505ce change token for !crc -> !! and added colors to it 2022-12-03 12:35:22 +01:00
nvx 4962752472 Fix trace list -r (relative times) not working unless the -u (microseconds) flag was also provided. 
Also makes the `--frame` option respect microseconds and relative times as well.
 2022-12-02 20:13:13 +10:00
E.Nigma 417a6076cb Add keys 2022-11-29 09:34:32 +01:00
iceman1001 c88c3bc4f2 maur keys 2022-11-25 17:30:05 +01:00
Iceman f9aa183382
Merge pull request #1821 from DidierA/gen4_ident 
Add Magic Gen4 GTU detection
 2022-11-25 17:23:19 +01:00
DidierA c54db094cd hf_mf_ultimatecard: '-w 0' now formats whole Mifare classic 4k 2022-11-25 10:16:24 +01:00
DidierA 9a0427d4d2 Add Magic Gen4 GTU detection and symbols for Gen4 GTU protocol. 2022-11-25 10:13:33 +01:00
Iceman 2453d9bc81
Merge pull request #1820 from jmichelp/master 
Fix overflow in SPI memory when writing default key dictionnaries.
 2022-11-25 07:21:09 +01:00
Iceman f3642c1a6e
Merge pull request #1819 from toucan12/ksx6924 
Add initialization command response interpretation on the ksx6924 (Tmoney) card
 2022-11-24 03:52:43 +01:00
Iceman bad56a74ff
Merge pull request #1818 from DidierA/hf_mfu_esave 
use calloc(), not malloc()
 2022-11-24 03:48:08 +01:00
Jean-Michel Picod 1adec4dfb2 Fix overflow in SPI memory when writing default key dictionnaries. 
Boundaries were defined in the memory layout but weren't enforced
by the client, causing an overflow when trying to load a
dictionnary that was too big.
It's too hard to enforce it on the ARM side as the command is a
generic write.
Now that limits are defined, also outputs them as part of the
`hw status` command.
 2022-11-24 03:16:58 +01:00
Geonyeob Kim 878d123a78 parse the hf ksx6924 init response 2022-11-24 00:59:42 +09:00
Geonyeob Kim 0890884cd5 textual 2022-11-24 00:57:13 +09:00
Geonyeob Kim 864b632a19 typo 2022-11-24 00:54:47 +09:00
DidierA d4f08abec3 Change calloc() so it passes Widnows build test 
Code compiles under linux (not tested yet, I have no proxmark available right now)
Previous commit fails windows build test with:

src/cmdhfmfu.c: In function 'CmdHF14AMfuESave':
src/cmdhfmfu.c:4220:19: error: array subscript 'mfu_dump_t[0]' is partly outside array bounds of 'mfu_dump_t[0]' [-Werror=array-bounds]
 4220 |         end = dump->pages ;
      |                   ^~
In function 'GetMfuDumpFromEMul',
    inlined from 'CmdHF14AMfuESave' at src/cmdhfmfu.c:4202:15:
src/cmdhfmfu.c:4105:21: note: object of size 1076 allocated by 'calloc'
 4105 |     uint8_t *dump = calloc(MFU_MAX_BYTES + MFU_DUMP_PREFIX_LENGTH, sizeof(uint8_t));
      |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 2022-11-23 11:40:56 +01:00
flamebarke 75ef73dd57
Update hf_i2c_plus_2k_utils.lua 
Signed-off-by: flamebarke <39644720+flamebarke@users.noreply.github.com>
 2022-11-23 09:09:37 +08:00
Shain Lakin 5458618053 Added new script for modifying user memory in sector 0 and 1 on the NTAG I2C PLUS 2K tag. 
Can also be used to dump a sector to disk, and write a file to a sector.
 2022-11-23 08:58:03 +08:00
DidierA 182d167aad use calloc() 2022-11-21 22:05:24 +01:00
Iceman 1527677bc4
Merge pull request #1815 from DidierA/hf_mfu_esave 
Add hf mfu esave
 2022-11-21 21:29:05 +01:00
DidierA b857205504 Add hf mf gsave 2022-11-21 19:18:14 +01:00
DidierA 584e0ad833 Added hf mfu esave 2022-11-21 01:05:48 +01:00
iceman1001 b36eaac3bf Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-11-20 16:49:41 +01:00
iceman1001 5b790afe43 renamed param dict / f for more consistency overall 2022-11-20 16:48:20 +01:00
iceman1001 317ddf42bc style 2022-11-20 16:47:49 +01:00
iceman1001 4dfcd44edd return default value when arg is not enforced with u32_1 2022-11-20 16:43:12 +01:00
iceman1001 4fb096966e extra checks for argument parsing of ints. And some text updates. There are other int parsing but they are checked with mandatory param int1 2022-11-20 16:34:45 +01:00
DidierA 9dbd6e5f23 change help text to fit screen 2022-11-20 15:31:58 +01:00
DidierA 1d00ef797c hf 14a sim, hf mfu sim: add hint for Ultralitgh EV1 2022-11-20 01:26:42 +01:00
DidierA f828a727c9 Fix: hf 14a sim parsing args was taking tag type as number of reads if no -n option given 2022-11-20 01:01:11 +01:00
iceman1001 971452f817 renamed luascript 2022-11-16 18:16:39 +01:00
Shain Lakin 789e338c4f Renamed to hf_mfu_ntag 
Modified CHANGELOG.md
 2022-11-16 14:14:50 +08:00
Shain Lakin 6381a19243 Rename to hf_mfu_next.lua 
Add entry to changelog.md
 2022-11-16 14:10:45 +08:00
flamebarke dd8110871d Create hf_mfu_next.lua 
Add to CHANGELOG.md
Rename to hf_mfu_ntag.lua

Signed-off-by: flamebarke <39644720+flamebarke@users.noreply.github.com>
 2022-11-16 14:08:11 +08:00
iceman1001 6c163fa262 added a check for static encrypted nonces when collecting encrypted nonces for hardnested to run. Will abort the collection if detected. 2022-11-15 07:07:26 +01:00
DidierA da1ce30533 hf mf gview, gload : 2x speed 
on Gen4 GTU cards, a select was made before each read or write command.
This commit adds a flag parameter to the read and write commands,
and gload and gview commands use this flag to tell when to select and end.

The trace buffer also contains the complete operation instead of the last
blokc read/write.

Speed gain:
`time ./proxmark3 -p /dev/ttyACM0 -c 'hf mf gview --4k'`
before: about 20s, now: about 7s

`time ./proxmark3 -p /dev/ttyACM0 -c 'hf mf gload --4k -f ../../../dumps/4k.bin'`
before: about 23s, now: about 10s
 2022-11-13 01:37:52 +01:00
Didier Arenzana 2f49b2c8cf
Merge branch 'RfidResearchGroup:master' into hf_mf_gen4_rewrite 2022-11-13 00:46:07 +01:00
iceman1001 c393b0caca adapted hardnested and autopwn to detect MFC Ev1 cards and use the known sector key in the key recovery vectors 2022-11-12 09:39:28 +01:00
iceman1001 bde4e8d754 test.2 2022-11-12 07:16:02 +01:00
iceman1001 c74e095dc9 test.. 2022-11-12 07:12:41 +01:00
iceman1001 d465c5a921 a test thingy 2022-11-12 06:32:08 +01:00
iceman1001 9353f8ce9a fix coverity CID #402839, resource leak 2022-11-11 23:51:30 +01:00
iceman1001 dbb5e6d4c1 fix coverity CID #402836, #402837, #402838 2022-11-11 23:49:49 +01:00
iceman1001 64b13679d7 some default ones 2022-11-11 03:39:31 +01:00
DidierA 885911c469 Rewrite of magic Gen4 GTU commands : refactor and speed 2022-11-09 15:49:07 +01:00
elcuervo c8f8685819
Adds some context for both Argentina and Uruguay keys 2022-11-08 10:07:07 -03:00
DidierA 3ac9c61cbf Fix read oob in data diff 2022-11-08 02:04:13 +01:00