Commit Graph

11298 Commits

Author SHA1 Message Date
nvx e22776a7e0 style 2024-01-26 20:20:25 +10:00
nvx 49f7ae57dc Changed hf mf gdmcfg/gdmsetcfg commands to support Gen1a and GDM Alt magic wakeups
This was implemented with a new pair of RPCs CMD_HF_MIFARE_READBL_EX and CMD_HF_MIFARE_WRITEBL_EX
these RPCs support all combinations of read/write commands, wakeup, and auth options so
in time can replace the other MFC read/write commands too reduce armsrc code size
and complexity.

Also added config parsing for the gdm cfg block when reading with hf mf gdmcfg and
explicitly with hf mf gdmparsecfg.
2024-01-26 20:09:08 +10:00
nvx b4ae4c429f Fix some low hanging differences when running make style on Windows vs Linux 2024-01-26 20:08:36 +10:00
iceman1001 41d545f5b8 text 2024-01-25 16:35:20 +01:00
iceman1001 596b0b6405 style 2024-01-25 16:25:03 +01:00
iceman1001 2288c7e72b less memory footprint 2024-01-25 16:23:00 +01:00
iceman1001 282ae9308d fix some semicolons 2024-01-25 16:20:40 +01:00
Iceman 680f63ed64 Merge pull request #2274 from lnv42/pr1
iso15: fix "restore" and "view" cmd for the new dump format
2024-01-25 15:04:09 +01:00
Iceman 3d0d77b12b Merge pull request #2273 from lnv42/master
iso15: provide support to load old JSON dump format into iso15_tag_t
2024-01-25 15:02:41 +01:00
Yann GASCUEL 9ace97aabc iso15 fix view with new dump format 2024-01-25 14:11:13 +01:00
Yann GASCUEL 169780fec0 iso15: fix restore with new dump format 2024-01-25 14:11:08 +01:00
Yann GASCUEL 6d931778a4 iso15 json parsing fix codeQL issue (hope it's the last...) 2024-01-25 14:08:40 +01:00
Yann GASCUEL c97b3b7b63 iso15: fix formater issue codeQL reported 2024-01-25 13:40:36 +01:00
iceman1001 649e8f581a fixed hf 15 writedsfid, it was missing the longer wait for writes. Also made the command honor the -o flag instead of enforing it. I tested with and without on a card and both works 2024-01-25 12:11:44 +01:00
Yann GASCUEL f91e65dce5 iso15: try to fix codeQL errors 2024-01-25 12:10:13 +01:00
Yann GASCUEL fdb9bbd714 iso15 dump file handling: support loading old JSON in iso15_tag_t 2024-01-25 11:37:37 +01:00
Yann GASCUEL 7e3112242e iso15 dump file handling: set old format as obsolete in saver 2024-01-25 11:37:37 +01:00
iceman1001 efc8c0b8ab added a interactive flag for hf14asniff, and unified text across the project 2024-01-25 10:21:36 +01:00
Yann GASCUEL 63afe5e97a iso15: add more sanity check in eload 2024-01-25 08:56:47 +01:00
Yann GASCUEL fbbfa0c356 iso15 JSON dump loading: fix loaded size 2024-01-25 08:38:35 +01:00
iceman1001 414275802d style 2024-01-25 01:55:07 +01:00
iceman1001 9f015ad964 hf mfu amii, which is a in client version of the amiitool by @socram8888. Have not decided how this command should work. It would be nice to have a decoder for Amiibo tags. Right now we do decrypt / encrypt for dump files and card memory. 2024-01-25 01:53:11 +01:00
iceman1001 28b887aedb text 2024-01-25 01:45:18 +01:00
iceman1001 9b3a088f58 macOS doesnt pragm 2024-01-25 01:02:20 +01:00
iceman1001 f7e4b4e2eb fix some style and it now also copy right string length 2024-01-25 00:36:35 +01:00
iceman1001 ba578ee139 hf 15 sim, reverse uid and a shorter read from emul to get uid if none is user given 2024-01-25 00:34:05 +01:00
iceman1001 a6fa662d3c increase upload block size for 15 eload, was 64 now 256 2024-01-24 23:37:13 +01:00
iceman1001 2972ff9694 json is case sensitive 2024-01-24 23:35:16 +01:00
iceman1001 2d9c1a941c style 2024-01-24 18:18:13 +01:00
Yann GASCUEL 472b6a8c64 cmdhf15: fix sanity check (uidlen alone is > 1 when -u is set) 2024-01-24 17:33:18 +01:00
Iceman 769a0aa26b Merge pull request #2270 from martian/rename-cmdreadmem-flag
Rename CMD_READ_MEM_DOWNLOAD flag.
2024-01-24 17:11:15 +01:00
Martijn Plak 6202da367f coding style 2024-01-24 17:05:37 +01:00
Martijn Plak 1d14bc38c5 Rename CMD_READ_MEM_DOWNLOAD flag.
It got included in pm3_cmd.lua but shouldn't be because it's not a command.
Also, the bitshift in the value upsets some versions of lua.
2024-01-24 16:36:52 +01:00
Yann GASCUEL 2aa419beba cmdhf15: addapt sim to new iso15sim eml format 2024-01-24 13:59:13 +01:00
Yann GASCUEL 524a439d6e cmdhf15: dump: fix arg parsing/sanitization 2024-01-24 13:59:13 +01:00
Yann GASCUEL 7f666d445c cmd_hf_15: fix & simplify flag parsing 2024-01-24 13:59:13 +01:00
Yann GASCUEL 7c44337941 cmdhf15: addapt dump to new iso15sim eml format 2024-01-24 13:59:13 +01:00
Yann GASCUEL e6bca3221d cmdhf15: addapt eview to new iso15sim eml format 2024-01-24 13:59:13 +01:00
Yann GASCUEL 0bbb054b33 cmdhf15: addapt eload/esave to new iso15sim eml format 2024-01-24 13:59:13 +01:00
Yann GASCUEL ddaba93d32 client: fileutils: iso15sim: add jfs15_v4 JSON format to fit eml fmt 2024-01-24 13:59:13 +01:00
iceman1001 ab0c46a22b fingerprint regardless if we got pwd nor not 2024-01-23 15:38:52 +01:00
iceman1001 081ff216eb style 2024-01-23 15:28:50 +01:00
Martijn Plak 6524c7ada7 readmem: remove superfluous printing of filename 2024-01-23 08:39:50 +01:00
Martijn Plak 2f324918b3 readmem: fix entry of numbers and allow hexadecimal 2024-01-23 08:36:53 +01:00
martian b86065c4ea Merge branch 'master' into flashdump
Signed-off-by: martian <martijn@plak.net>
2024-01-22 21:05:13 +01:00
iceman1001 2f6df627dc modified mfu info to correctly identify ntag i2c tags 2024-01-22 20:09:44 +01:00
Martijn Plak de91e850b4 use fileutils to write memory dump 2024-01-22 18:16:27 +01:00
Martijn Plak e35385fde1 Adding processor flash memory reading, viewing and writing to file.
Works when the device is running either osimage or bootloader.

- New memory reading command in osimage and bootloader.
- Extended 'hw readmem' command with length parameter, file writing and hex viewer.
- Introduced '--dumpmem' option to proxmark3 executable to support dumping from bootloader.

Simple interactive examples:
  hw readmem -f flashdump
  hw readmem -l 1024
CLI example:
  ./pm3 --dumpmem flashdump.bin

Reading from arbitrary memory ranges can be unlocked using the 'raw' option.
2024-01-22 16:40:05 +01:00
iceman1001 c6adda54ed from MFC 2024-01-21 19:47:23 +01:00
iceman1001 511cc8df15 style 2024-01-20 23:15:10 +01:00