Commit Graph
22392 Commits
Author SHA1 Message Date
歐歪 fe40e23c85 feat: auto gdm_wakeup_attempts 2026-08-22 02:40:56 +08:00
iceman1001 d3391bef3c missing files for jpeg2000 2026-08-21 20:12:26 +02: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
Philippe Teuwen 72d72ddc9d update extflash init scripts 2026-08-20 10:11:42 +02:00
s00se 0482fa8757 Add API check to Android spinlock shim
Android spinlock shim not needed on modern (API 24+) Android, this fixes compiling on Termux

Signed-off-by: s00se <95649696+s00se@users.noreply.github.com>
2026-08-19 20:04:03 -06:00
Philippe Teuwen cb5b3b65c8 pm5 doc: cmake for ARM 2026-08-19 22:56:46 +02:00
Philippe Teuwen 4da4eb706a Fix bug in bootrom.bin target 2026-08-19 22:18:48 +02:00
Philippe Teuwen fbfe53d0bb update pm5 doc 2026-08-19 22:02:28 +02:00
Nemanja Nedeljkovic 6da7c77427 feat(pm5): report AT32 MCU, flash size and PM5 target in hw version/status
`hw version` and `hw status` decoded the reported chip id as an Atmel AT91
CIDR. On PM5 (AT32) the id is an ARM DBGMCU IDCODE, so it showed
"MCU Unknown", a bogus flash size (32 KB / 973% used) and "PM3 GENERIC".

- Client: when IfPm5(), print MCU "AT32F437" and the real flash size, and add
  a "PM5" target line, instead of running the AT91 decode.
- Firmware: the flash size can't be derived from the AT32 IDCODE, so the device
  now sends GetChipFlashSize(). It is appended AFTER the version string in the
  CMD_VERSION reply, so the wire layout is unchanged and it stays compatible in
  both directions (old client ignores the trailing bytes; new client length-
  guards and treats a missing value as 0). GetChipFlashSize() already exists for
  both AT91 and AT32.
2026-08-19 21:49:43 +02:00
Philippe Teuwen 06bc3239ab Proxmark5 instructions, WIP 2026-08-19 21:40:15 +02:00
Nemanja Nedeljkovic b81966c419 fix(pm5): select an ERTC clock before the BPR write
The AT32 battery-domain helper at32_bpr_write_dt1() enabled the ERTC (ertcen)
but never selected an ERTC clock source (ertcsel stayed NOCLK). Writing the
ERTC write-protection register (ERTC->wp) requires the ERTC to be clocked, so
with no source the write stalled the APB once the CPU ran at the full PLL clock
(288MHz, 144MHz APB); it only survived on the slow HICK clock.

The bootrom reaches this via check_goto_flash_mode() -> system_bpr_chk_clear()
while reading/clearing the "enter flash mode" magic the OS sets on a software
reset. That runs after ConfigSystemClocks() (the button branch needs
SpinDelayUs()/the timer clock, so the clock must be up first), i.e. at 288MHz,
so the bootrom hung and the device never re-enumerated into the bootloader
until a physical USB replug.

Fix: select the ERTC clock (HEXT/20, as the tick HAL does) before touching the
ERTC registers. HEXT is running by the time this executes, so the wp write no
longer stalls. The fix is contained in the AT32 HAL (sys_hw_at32.c, which only
builds for AT32/PM5); the shared bootrom flow and its ConfigSystemClocks()-first
ordering (needed by AT91/RDV4 SpinDelayUs) are unchanged.
2026-08-19 19:33:01 +02:00
Philippe Teuwen caa76f57b3 Fix pm5 recovery image 2026-08-19 19:28:17 +02:00
dxl 86dfdfff89 Fixed a bug in reading hitagU and hitagS on RDV4. 2026-08-19 18:53:35 +02:00
iceman1001 75c2803d30 Corrected the file extension 2026-08-19 18:48:12 +02:00
Philippe Teuwen 4e684cb4d3 PM5: Detect incompatible PLATFORM_EXTRAS 2026-08-19 17:52:15 +02:00