Commit graph

18135 commits

Author SHA1 Message Date
iceman1001
a10cb841d9 lf em 4x05 view - better cardtype identification of files 2024-01-28 12:59:33 +01:00
iceman1001
0afeb77c82 14b sim clean up 2024-01-28 12:30:29 +01:00
iceman1001
bb107587f9 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2024-01-28 11:16:53 +01:00
iceman1001
5028d6f664 style 2024-01-28 11:16:45 +01:00
iceman1001
10bb086ffd use after free fix 2024-01-28 10:20:02 +01:00
iceman1001
b12799ea5f text 2024-01-28 02:10:44 +01:00
iceman1001
6104086374 wrong handling of array sizes 2024-01-26 23:06:01 +01:00
iceman1001
6df068f817 fix memory copy... 2024-01-26 22:53:29 +01:00
iceman1001
07983aa1b4 added a rdbl commmand 2024-01-26 22:50:52 +01:00
iceman1001
cedc593528 dump/info readblock loops rework 2024-01-26 22:41:06 +01:00
iceman1001
5de626992f extended read block and read block annotation. Adapt select_card to keep antenna on when dump/info 2024-01-26 22:09:37 +01:00
iceman1001
65e9493bce the select funct also disconnect reader, so we must add select to read block fct 2024-01-26 21:53:54 +01:00
iceman1001
bfa912952e added a trace of xerox info execution 2024-01-26 21:25:45 +01:00
iceman1001
0119049cbe fix return value 2024-01-26 21:13:25 +01:00
iceman1001
68d9fe3232 annotate xerox reads 2024-01-26 21:10:11 +01:00
iceman1001
7128c8cfdf invert 2024-01-26 20:54:44 +01:00
iceman1001
c7af357dc1 style 2024-01-26 20:48:41 +01:00
iceman1001
c44a4268f9 text 2024-01-26 20:48:12 +01:00
iceman1001
d5b1ff013f annotate XEROX wup 2024-01-26 20:33:08 +01:00
iceman1001
98f64a4ca5 annotate XEROX a bit better 2024-01-26 20:26:43 +01:00
iceman1001
adfab4992d not clear how the slot marker / anticollision loop works for xerox but we seem to ignore retlen 2024-01-26 19:48:52 +01:00
iceman1001
d5e99e394e clean 2024-01-26 18:52:30 +01:00
iceman1001
0796209ee4 xerox doesnt use framing 2024-01-26 16:48:01 +01:00
iceman1001
708898c942 playing with the 15 info output 2024-01-26 14:57:24 +01:00
iceman1001
8e2fb4a6a7 increased the number of pages in the dumps to 160. 0xA0. Its should cover 128 / 0x80 and potential larger ones 2024-01-26 14:25:39 +01:00
iceman1001
3a1c3510ae text 2024-01-26 14:22:48 +01:00
iceman1001
6b9dde1ff7 text 2024-01-26 14:11:20 +01:00
iceman1001
837a36f4eb text 2024-01-26 13:16:44 +01:00
iceman1001
79d143c970 fix json loading for lf em 4x05 2024-01-26 13:14:34 +01:00
iceman1001
d215f18fdb reworked the tag memory printing for HF 15* 2024-01-26 12:50:09 +01:00
iceman1001
303c6b6067 style 2024-01-26 12:45:23 +01:00
Iceman
148984aeee
Merge pull request #2277 from nvx/gdmcfg_magic_wakeup
Add support for magic wakeups in GDM/USCUID config commands
2024-01-26 12:27:39 +01:00
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
acdda19316 style 2024-01-25 16:21:41 +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