Commit Graph
13908 Commits
Author SHA1 Message Date
iceman1001 a9b98819bb fix not assigned warning 2026-08-20 17:20:45 +02: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 4f410992d4 Merge branch 'master' into mfdes-chk-keylogic
Signed-off-by: Iceman <iceman@iuse.se>
2026-08-20 21:45:52 +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
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
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
iceman1001 75c2803d30 Corrected the file extension 2026-08-19 18:48:12 +02:00
Chloé Franke 7587a05cf1 Inverted verbose flag to work correctly 2026-08-19 16:28:10 +02:00
Philippe Teuwen 6863314019 Remove tabs 2026-08-19 15:51:54 +02:00
Philippe Teuwen 52af3f11e2 rename a couple of commands 2026-08-19 15:51:54 +02:00
Philippe Teuwen f82ac61e78 Prompt the user when flash_suggest_update_bootloader()
pm3line_init() delayed to not install signal handlers on other usages than interactive client
2026-08-19 15:51:54 +02:00
dxl cbc56f720d Abstract the flash.c to avoid hard coding that makes it impossible to cross platforms. 2026-08-19 15:51:18 +02:00
Chloé Franke b045bb6f4a Fixed wrong type for format string 2026-08-19 15:39:53 +02:00
Chloé Franke 74eb81392a Added guard for no keys provided back. 2026-08-19 15:38:42 +02:00
Chloé Franke c6971eb3e4 Added info print for number of loaded keys back 2026-08-19 15:30:17 +02:00
Chloé Franke 2db9c2bc46 corrected key count logic; fixed info prints to display only when a key was found 2026-08-19 15:04:35 +02:00
Chloé Franke 4b51fea936 Merge branch 'master' into mfdes-chk-keylogic 2026-08-19 13:40:11 +02:00
Chloé Franke 070bdf78a1 Fixed hardcoded length of debug print of authentication nonce for mifare desfire 2026-08-19 13:20:52 +02:00
Cole Munz 0b40585124 Set the stringop-overflow flags before add_subdirectory(deps)
With the linker pin in place the proxspace job gets past the bootrom and
dies later instead, in the cmake build:

  client/deps/jansson/load.c:193:35: error: writing 1 byte into a region
  of size 0 [-Werror=stringop-overflow=]

client/CMakeLists.txt already turns that false positive off for GCC 10
and newer, but it does it at line 876 while add_subdirectory(deps) runs
at line 295. CMake copies the calling scope into a subdirectory at the
add_subdirectory call, so anything set afterwards never reaches the
bundled deps, and jansson is built without the suppression that the rest
of the client gets.

Move the block above the add_subdirectory call in both client and
experimental_lib. Checked by configuring before and after: 0 of 17 deps
targets carried -Wno-error=stringop-overflow in their flags.make before,
17 of 17 after.

ubuntu-cmake and macos-cmake stay green either way; their compilers do
not emit this particular false positive, which is why the gap went
unnoticed while the bootrom link was failing first.

Signed-off-by: Cole Munz <Munzzyy1@proton.me>
2026-08-19 13:18:46 +02:00
Philippe Teuwen ddd8e57427 Make loclass/cipher_bs_avx* compatible with clang 2026-08-19 12:59:29 +02:00
Philippe Teuwen 430fea5338 Guard fpga config flash mode with capability 2026-08-19 12:04:33 +02:00
Philippe Teuwen 7c436d2d58 guard pm5 commands with capabilities 2026-08-19 12:04:33 +02:00
Philippe Teuwen d2a8cca233 Add pm5 capabilities 2026-08-19 12:04:33 +02:00
Philippe Teuwen 420e36968b cmdfpga: clear error msg 2026-08-19 12:04:33 +02:00
dxl defa6ca212 Fixed a bug that caused a stringop-overflow warning when compiling load.c. 2026-08-19 12:04:33 +02:00
Philippe Teuwen 66c5fd8343 Fix external flash sanity check in prevision of pm5 2026-08-19 12:04:33 +02:00
dxl c56497a629 Supplement logic comments to avoid misleading developers. 2026-08-19 12:04:32 +02:00
Philippe Teuwen d2a2d63854 Fix CodeQL warning on printf 2026-08-19 12:04:32 +02:00
dxl dca419413b Added cmd(fpga, antennal, qc...) for Proxmark5 2026-08-19 12:04:32 +02:00
Philippe Teuwen a061f080ed experimental_lib: add missing cmdfpga.c 2026-08-19 12:04:32 +02:00
dxl 7f946eb16f Fixed an issue where compiling the client using CMake failed. 2026-08-19 12:04:32 +02:00
dxl 83114823ec Added cmdfpga for client. 2026-08-19 12:04:32 +02:00
oSPANNERo 2246341dff Merge branch 'master' into fix-readable-mfc-keyb
Signed-off-by: oSPANNERo <25675033+oSPANNERo@users.noreply.github.com>
2026-08-18 18:37:11 -04:00
Iceman d3aa3d25c4 Merge pull request #3467 from kormax/felica-container-issue-information-devices
Detect and print mobile FeliCa device model in `hf felica info`
2026-08-19 02:11:01 +07:00
Iceman 90e0b7fd8a Merge pull request #3455 from ry4000/master
R&Y: Added static FEC key to `mfc_default_keys.dic`
2026-08-19 02:09:47 +07:00
Iceman a91e5dd174 Merge pull request #3454 from cindersocket/feat-proximity-check-file
Add application proximity check selection
2026-08-19 02:09:26 +07:00
Iceman bd7fe79b63 Merge pull request #3457 from c-barron/docs/uscuid-ul-commands
Document USCUID-UL commands and fix hf_mf_uscuid_prog usage name
2026-08-19 02:08:35 +07:00
Iceman c9a6746586 Merge pull request #3451 from gentilkiwi/patch-1
Update Calypso operators for TAO / Orléans
2026-08-19 02:07:36 +07:00
Iceman 7174cf9036 Merge pull request #3461 from AliBello/patch-1
Add new AID entry for OV Pas card
2026-08-19 02:07:18 +07:00
Iceman b11067253a Merge pull request #3462 from Akury83/master
Update aid_desfire.json
2026-08-19 02:06:54 +07:00
Iceman d121b17975 Merge pull request #3450 from kormax/felica-mfg-time
Detect and print FeliCa manufacturing date in `hf felica info`
2026-08-19 02:05:41 +07:00