RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-10 02:04:39 +08:00
Code Issues Projects Releases Packages Wiki Activity
15967 commits 3 branches 15 tags 86 MiB
Commit graph

15967 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jean-Michel Picod
b70320d47d Fixing some ISO7816-4 logic. 
- Fixing overflow in BigBuffer if requesting to much data
- Fixing integer wrapping with the SIM module by capping APDU data
  length
- Fixing chaining logic which was loosing previously received data
 2022-12-05 10:54:38 +01:00
iceman1001
b557291a00 print sectors for mifare 2022-12-04 19:28:22 +01:00
iceman1001
d170f68a00 fix compilation error, and more debug statements 2022-12-04 15:34:35 +01:00
iceman1001
37100a8a18 fix compilation error 2022-12-04 15:15:24 +01:00
Iceman
ce3ca0e7d1
Merge pull request #1825 from natmchugh/master 
Get the hitag2 dump command working as per docs
 2022-12-04 13:45:57 +01:00
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
4f70f777de typedef file for vigik annotater 2022-12-03 20:37:53 +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
iceman1001
87f29d1fa9 node12 is deprecated, v3 uses Node16 2022-12-03 12:31:53 +01:00
iceman1001
951bfb580d V2 used Node12, which is deprecated for Node16 2022-12-03 12:28:07 +01:00
iceman1001
93f8021049 remove old dependency 2022-12-03 12:21:29 +01:00
Iceman
71c5e45f37
Merge pull request #1826 from nvx/bugfix/trace_relative_times 
Fix `trace list -r` (relative times)
 2022-12-03 12:04:22 +01:00
iceman1001
a5b681bf88 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-12-03 11:58:25 +01:00
iceman1001
9627c9dc28 liblua5.2-0-dbg package doesnt seem to exist anymore 2022-12-03 11:57:54 +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
Nathaniel McHugh
3326a58c0d
Update CHANGELOG.md 
Signed-off-by: Nathaniel McHugh <natmchugh@gmail.com>
 2022-11-30 16:42:00 +00:00
Nat McHugh
cfc72fb5f1 Fix the dump command hitag2 2022-11-30 15:49:39 +00:00
Iceman
4e24d463e7
Merge pull request #1824 from TrevorSayre/patch-1 
Update Termux notes to recommend F-Droid
 2022-11-29 22:18:53 +01:00
Trevor Sayre
28c48fe823
Update Termux notes to recommend F-Droid 
Signed-off-by: Trevor Sayre <sayret@gmail.com>
 2022-11-29 15:33:04 -05:00
Iceman
9986cc6885
Merge pull request #1823 from r1ddl3rz/master 
Add keys
 2022-11-29 20:11:14 +01: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
Jean-Michel Picod
8da4da6aa5 Also update comment about total size for Mifare keys storage. 2022-11-24 09:40:34 +01:00
Jean-Michel Picod
5bf0200b02 Update CHANGELOG.md 2022-11-24 09:37:02 +01:00
Jean-Michel Picod
ba83c26c1e Add one more sector for Mifare keys on SPI flash. 
This is a breaking change and after firmware upgrade, dictionnaries
should be loaded into flash again to ensure they're valid.
 2022-11-24 09:35:22 +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
Iceman
6651cf48cf
Merge pull request #1817 from flamebarke/master 
Added luascript for the NTAG I2C PLUS 2k
 2022-11-23 06:29:01 +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
Iceman
9104949d68
Merge pull request #1816 from DidierA/hf_mf_gsave 
Add hf mf gsave
 2022-11-21 21:24:11 +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