Commit Graph
22754 Commits
Author SHA1 Message Date
Philippe Teuwen 644ebba3d7 Try to fix MSYS2 compilation with openjpeg 2026-08-22 00:54:36 +02:00
Philippe Teuwen 95db547747 Remove object file 2026-08-22 00:16:25 +02:00
iceman1001 26c23f6808 fix missing files 2026-08-21 23:15:01 +02:00
iceman1001 20a5cb5e7f missing pace files and tests 2026-08-21 22:33:05 +02:00
iceman1001 f6e0119f5f added PACE (--can) support to emrtd commands. 2026-08-21 22:32:06 +02:00
Iceman 122637f26f Merge pull request #3488 from 0x6r1an0y/20260820-ntagwriter
Complete hf mfu ntagwriter command
2026-08-22 02:35:12 +07:00
Iceman d16866f1a3 Merge pull request #3490 from xianglin1998/expand_fun
To expand crm_ertc_clock_select() in at32_bpr_write_dt1() for reduce code size
2026-08-22 02:32:44 +07:00
Iceman fbebbd4b78 Merge pull request #3489 from xianglin1998/fix_hitag2_sniff
Fixed hitag2 sniff.
2026-08-22 02:31:55 +07:00
dxl 2a11c73bbe To expand crm_ertc_clock_select() in at32_bpr_write_dt1() for reduce code size. 2026-08-22 03:04:27 +08:00
dxl 5174a54cbc Fixed hitag2 sniffing.
1. Fixed a bug where old data caused incorrect bitwise operation results.
2. Do not call ResetLoEdgeCapture(), as this will prevent the condition rb >= HITAG_T_EOF from ever being met.
3. PM5 and RDV4 have been tested and have good compatibility.
4. FPGA_LF_EDGE_DETECT_TOGGLE_MODE seems to be useless.
2026-08-22 02:35:50 +08:00
歐歪 c35b682c31 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into 20260820-ntagwriter 2026-08-22 02:14:22 +08:00
歐歪 644365b4e2 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into 20260820-ntagwriter 2026-08-22 02:13:48 +08:00
iceman1001 d3391bef3c missing files for jpeg2000 2026-08-21 20:12:26 +02:00
歐歪 cdca934f7e feat: hf mfu ndefwrite command 2026-08-22 02:11:29 +08:00
iceman1001 0f3092ceb8 added support to view JPEG2000 images commonly used with epassports. The lib use a BSD-2 license compatible with our GPL3+ 2026-08-21 20:10:30 +02:00
iceman1001 68af7e2582 - now correctly shows multiple images in the image viewer. Thanks Claude! 2026-08-21 19:41:27 +02:00
Iceman 9310f93df6 Merge pull request #3484 from jonyen/fix-grabbed-output-heap-overflow
fix: heap overflow in pm3_grabbed_output_get
2026-08-21 22:11:50 +07:00
Iceman d3326dde78 Merge pull request #3486 from Antiklesys/master
Improved clock ticks in iclass.c
2026-08-21 17:43:17 +07:00
Antiklesys 7ce6a72cfc Update iclass.c 2026-08-21 16:33:19 +08:00
Iceman fa1ebcc18a Merge pull request #3485 from Antiklesys/master
Added CMD_HF_ICLASS_RAW
2026-08-21 15:31:35 +07:00
Antiklesys 6a317bdacc Added CMD_HF_ICLASS_RAW
Raw iCLASS reader exchange that leaves the field ON
2026-08-21 12:45:46 +08:00
Jonathan YenandClaude Opus 5 d515458973 fix: heap overflow in pm3_grabbed_output_get
pm3_grabbed_output_get null-terminated the captured output at
g_grabbed_output.size, but size is the allocated capacity, not the number of
bytes written -- ui.c grows it by MAX_PRINT_BUFFER at a time and tracks the
used length separately in idx. Every call therefore wrote one zero byte past
the end of the heap allocation.

The CLI mostly survives it because it calls the function once or twice and
then exits, so the corrupted malloc metadata is never reused. A long-running
libpm3 client that captures output on every command does not: the damage
surfaces later, far from the cause. It was found as a SIGTRAP inside an
unrelated AppKit autorelease pool.

Reproduced against real hardware:

  MALLOC_STRICT_SIZE=1 MallocGuardEdges=1 \
    DYLD_INSERT_LIBRARIES=/usr/lib/libgmalloc.dylib ./pm3run <port> "hw version"

which crashes with SIGSEGV inside pm3_grabbed_output_get before this change
and exits cleanly with identical captured output after it.

Terminating at idx is always in bounds: the grabber guarantees at least
MAX_PRINT_BUFFER bytes of headroom before each write, so idx is strictly less
than size.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AjGgtnsvWJHAMYEksAiYuf
2026-08-20 21:44:36 -04:00
Iceman c7c9938bfe Merge pull request #3483 from nffq/fix/hfmfsen_7b
fix: `hf mf sen` init wrong 4 bytes of UID for authentication
2026-08-21 05:37:27 +07:00
nffq 1646486787 Make #3483 more readable
Signed-off-by: nffq <143437252+nffq@users.noreply.github.com>
2026-08-21 05:01:02 +09:00
iceman1001 7ff85b09ec remove the old SAM implementation 2026-08-20 18:34:57 +02:00
Philippe Teuwen 4682271488 add sleep to rdv4_init_extflash t55xx config 2026-08-20 17:49:12 +02:00
Philippe Teuwen 76dfb643d3 pm5 instructions 2026-08-20 17:37:58 +02:00
iceman1001 a9b98819bb fix not assigned warning 2026-08-20 17:20:45 +02:00
nffq b6929d9108 fix: hf mf sen init wrong 4 bytes of UID for authentication 2026-08-21 00:04:34 +09:00
Iceman 7223422070 Update Proxmark5-Instructions.md
Signed-off-by: Iceman <iceman@iuse.se>
2026-08-20 17:00:02 +02:00
Iceman 3cbdfe3c1e Merge pull request #3475 from nemanjan00/fix/pm5-flash-mode-bpr-hick
fix(pm5): run flash-mode check on HICK before raising PLL clock
2026-08-20 21:52:18 +07:00
Iceman a7c696b9a0 Merge branch 'master' into fix/pm5-flash-mode-bpr-hick
Signed-off-by: Iceman <iceman@iuse.se>
2026-08-20 21:52:08 +07:00
nffq e9c61bca79 allow to break out of fm11_verify_candidates 2026-08-20 16:51:43 +02:00
nffq aca26117c0 fix: fm11_propagate_key_reuse_online always shows key A == key B when key B is read 2026-08-20 16:51:43 +02:00
Iceman d9066e365d Merge pull request #3481 from nemanjan00/doc-pm5-fpga-config-poweron
doc(pm5): run `hf 14a read` before `hw fpga config` to power on the FPGA
2026-08-20 21:48:03 +07:00
Iceman 45ac9fdfad Merge branch 'master' into doc-pm5-fpga-config-poweron
Signed-off-by: Iceman <iceman@iuse.se>
2026-08-20 21:47:12 +07:00
Iceman a746369cbe Merge pull request #3470 from corollary-de/mfdes-chk-keylogic
Fixes to key loading logic for mfdes chk
2026-08-20 21:46:04 +07:00
Iceman 4f410992d4 Merge branch 'master' into mfdes-chk-keylogic
Signed-off-by: Iceman <iceman@iuse.se>
2026-08-20 21:45:52 +07:00
Iceman 6151b26367 Merge pull request #3453 from trichimtrich/fix/iclass-unhash-preimage-enumeration
fix hf iclass unhash missing pre-images
2026-08-20 21:44:53 +07:00
Iceman f4b76715c1 Merge branch 'master' into fix/iclass-unhash-preimage-enumeration
Signed-off-by: Iceman <iceman@iuse.se>
2026-08-20 21:44:40 +07:00
Philippe Teuwen c9581bde4d rdv4_init_extflash: use same values as init_rdv4.lua 2026-08-20 15:45:57 +02:00
Nemanja Nedeljkovic f71bc53d0c fix(pm5): power on the FPGA in hw fpga config
`hw fpga config` drives the FPGA over JTAG, but on PM5 the FPGA has to be
clocked/powered first - previously that only happened as a side effect of a
reader command (e.g. `hf 14a read`), so `hw fpga config` failed if run on its
own. Bring the FPGA up in the HAL at the start of FpgaStartConfig()
(FpgaSetup24MHzClk) so the command works standalone; no doc workaround needed.
2026-08-20 15:36:17 +02:00
Philippe Teuwen 08f8dc8692 CARDHOPPER: document how to set CARDHOPPER_USB 2026-08-20 14:28:21 +02:00
Philippe Teuwen b11b85e51a CARDHOPPER: missing header 2026-08-20 14:28:21 +02:00
Chloé Franke 43e1f4db09 Merge branch 'master' into mfdes-chk-keylogic
Signed-off-by: Chloé Franke <git@corollary.de>
2026-08-20 12:21:38 +00:00
nffq 0b9d97be2b fix: FM11RF08S key recovery generates incorrect results when nt == 0 2026-08-20 13:37:34 +02:00
Nemanja Nedeljkovic 6507b8f36b feat(pm5): hf tune --rgb / lf tune --rgb - antenna RGB as a tuning meter
Adds an opt-in `--rgb` flag to the continuous `hf tune` / `lf tune` commands that
mirrors the antenna tuning level on the PM5 antenna RGB LED: blue = low, green =
mid, red = high, tracking the on-screen bar so you can find coupling (e.g. an
implant) by feel without watching the screen.

The colour is computed client-side from the same per-iteration voltage / running
peak the bar uses (so it matches the bar and auto-scales), and pushed to the
device via a new dumb CMD_PM5_RGB_SET {r,g,b}. That command is handled (#ifdef
PM5) by a dedicated AT32 RGB HAL module, common_arm/rgb/{rgb_apis.h,
rgb_hw_at32.c} (RgbLedSet(), I2C controller @ 0x48), wired into the armsrc
Makefile/CMake as SRC_RGB for PM5 only - so no other platform is affected and no
hardware code lands in shared files.
2026-08-20 11:55:55 +02:00
Iceman ad4a94b1a5 Merge pull request #3480 from s00se/spinlock-api-gate
Add API check to Android spinlock shim
2026-08-20 16:24:33 +07:00
Nemanja Nedeljkovic ba315d8d58 fix(pm5): suppress bogus [FPGA] version section on PM5
PM5's FPGA (Gowin GW1NR) bitstream is loaded at runtime via `hw fpga config`
and is not compiled into the firmware; only the Xilinx fpga_pm3_hf.bit is pulled
in (to generate g_fpga_version_information[]) which PM5 never runs. So the
`[ FPGA ] fpga_pm3_hf.ncd image 2s30vq100` line described a bitstream unrelated
to the actual device.

- Firmware (appmain.c): omit the [FPGA] section from the version string on PM5
  (#ifndef PM5), since there's no meaningful built-in FPGA version to report.
- Client (cmdhw.c): skip the FPGA_TYPE "chip mismatch" check for PM5, which would
  otherwise trigger now that the section is gone.
2026-08-20 10:36:09 +02:00
Nemanja Nedeljkovic 36027b48e6 fix(pm5): report PM5 in hw status [Model] firmware line
The [Model] section only distinguished RDV4 firmware from a "PM3 GENERIC"
else branch, so PM5 (AT32) fell through and printed "Firmware... PM3 GENERIC"
even though the banner/Target/MCU already report PM5/AT32F437. Add an IfPm5()
branch that prints "Firmware... PM5" and the external-flash status.

Note: the "[ FPGA ] ... 2s30vq100" line in hw version is separate and comes
from the firmware-generated version string (fpga_version_info.c). On PM5 the
build reuses the Xilinx fpga_pm3_hf.bit only to generate that version info
(see Makefile.hal PM5 TODO), while the real Gowin FPGA is loaded via JTAG, so
the reported bitstream name is a placeholder. Fixing that is a firmware/build
change, not addressed here.
2026-08-20 10:36:09 +02:00