Commit Graph
23643 Commits
Author SHA1 Message Date
abou28andClaude Opus 5.5 a8a6a902ca Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the entries
from #3760.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 01:00:07 +01:00
Iceman 5bcc61766a Merge pull request #3760 from tpglitch/fix/amiibo-emulation
Fix payload for CMD_HF_MIFARE_EML_MEMSET in hf_mfu_amiibo_sim.lua
2026-11-08 07:56:43 +08:00
tpglitch b15152662c fix: payload for in Lua script 2026-11-07 17:03:01 -06:00
Iceman ccc189c172 Merge branch 'master' into em4x50-liw-sync-fix-pr
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-07 16:53:43 +08:00
Iceman 9928112931 Merge pull request #3751 from matrix/fix-thinfilm-sim-restart
hf thinfilm sim: let a second simulation wait for its own end
2026-11-07 16:52:40 +08:00
Iceman 22e9e59b27 Merge branch 'master' into fix-thinfilm-sim-restart
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-07 16:52:28 +08:00
Iceman 07ff078491 Merge pull request #3739 from Ryan4n6/feat/mfulc-prng-backstop
feat(hf mfu): weak-PRNG backstop for Ultralight C fingerprint
2026-11-07 16:51:29 +08:00
Ryan MassfellerandClaude Opus 4.5 9616c8e45c docs: add CHANGELOG entry for ULC PRNG backstop
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-11-07 02:50:43 -05:00
Ryan MassfellerandClaude Opus 4.5 0839f3b708 fix(mfulc): trim verbose comments per review
- Remove wall-of-text comment block (moved to PR description)
- Simplify output: "Genuine" vs "Weak" per Iceman's feedback
- Remove explanatory INFO line

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2026-11-07 02:48:57 -05:00
Ryan4n6andClaude Opus 4.5 579bafa161 feat(hf mfu): add weak-PRNG backstop for Ultralight C fingerprint
The existing mfulc_fingerprint() detects known counterfeit families
(Lab401 DW, Feiju FJ8010, USCUID-UL v1/v2, Giantec GT23SC4489,
Hospitality) by their deterministic command and CRC tells, returning
early on a match. This commit adds a generic weak-PRNG catch-all for
clones that evade those fixed profiles.

mfulc_prng_test() runs on the genuine-looking fallthrough, right before
the "likely MF0ICU2" verdict. It collects RndB nonces via repeated 1A00
auth starts and flags a duplicate:

  - Genuine NXP draws RndB from a hardware TRNG (2^64 space), so it
    never repeats across a realistic batch.
  - Giantec/USCUID use a 16-bit LFSR whose wakeup-timing seed
    concentrates the observed pool to roughly 2^6.5, so a duplicate
    appears within 12 authentications.

A single collision is proof of a weak PRNG. This backstop catches
weak-RNG clones, including future variants the profile table does not
know. MFULC_PRNG_SAMPLES (40) and MFULC_PRNG_CLEAR (39) are tunable.

Tested on genuine NXP MF0ULC (UID 04 1C BE 92 E7 7A 80): 40 unique
nonces, no collision, verdict "consistent with a genuine TRNG".

Ref: "BREAKMEIFYOUCAN!", eprint.iacr.org/2026/100, Section 11.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_012e7xUDfDUXJQU7SWV3ULS1
2026-11-07 02:48:57 -05:00
abou28andClaude Opus 5.5 54751d8b5e Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the entries
from #3743.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 02:47:17 +01:00
Iceman 770cf12687 Merge pull request #3743 from mishamyte/feat/supercard-gen2-uid-write
hf mf supercard - UID write on super card generation 2
2026-11-07 09:46:26 +08:00
Iceman 4b5eadd32b Merge branch 'master' into feat/supercard-gen2-uid-write
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-07 09:46:11 +08:00
abou28andClaude Opus 5.5 21e2dced23 Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the entries
from #3753.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 02:43:22 +01:00
Iceman ee509adede Merge pull request #3753 from matrix/fix-wiegand-formats
wiegand: fix HPP32, H10320, S12906b, HGen37, format limits, list usage
2026-11-07 09:42:06 +08:00
Iceman 0bb60083d8 Merge branch 'master' into fix-wiegand-formats
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-07 09:41:56 +08:00
abou28andClaude Opus 5.5 38f6cb966f Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the entries
from #3756, #3757.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 02:39:41 +01:00
Iceman 05f0feaa8c Merge pull request #3757 from matrix/fix-secc-atqa
hf secc sim: code the UID size in the ATQA
2026-11-07 09:39:15 +08:00
Iceman 724e0b438c Merge branch 'master' into fix-secc-atqa
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-07 09:39:03 +08:00
Iceman c7fc27dd31 Merge pull request #3756 from matrix/fix-keri-limits
lf keri: refuse values the frame can't carry, print the sim id
2026-11-07 09:37:28 +08:00
Iceman fc3a14f8f5 Merge branch 'master' into fix-keri-limits
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-07 09:36:27 +08:00
abou28andClaude Opus 5.5 cb544d2a98 Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the lf paradox
entry from #3755.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 02:35:52 +01:00
abou28andClaude Opus 5.5 9bd65a8782 Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the NDEF TLV
entry from #3752.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 02:34:47 +01:00
Iceman 8932b63e96 Merge pull request #3755 from matrix/fix-paradox-limits
lf paradox: refuse FC above 255 and CN above 65535
2026-11-07 09:34:35 +08:00
Iceman 19fbb76ded Merge branch 'master' into fix-paradox-limits
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-07 09:33:48 +08:00
Iceman 4e0798a11e Merge pull request #3752 from matrix/fix-ndef-tlv
nfc: decode NULL, Lock Control and Memory Control TLVs as specified
2026-11-07 09:29:59 +08:00
Gabriele GristinaandClaude Opus 5.5 43223e0192 hf secc sim: code the UID size in the ATQA
The sim sent ATQA 02 00 for 4, 7 and 10 byte UIDs, because the ATQA
override replaces the size bits the firmware sets. The PN533 of an
SCL3711 stopped after cascade level 1 and never found a 7 or 10 byte
UID. The ATQA now codes the size of the UID the device simulates, 4
bytes from emulator memory when the UID is all zero, and the start
message says when that happens.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 01:05:20 +01:00
Gabriele GristinaandClaude Opus 5.5 49e5b502f5 lf keri: refuse values the frame can't carry, print the sim id
clone took negative FC and CN, and MS values above 5 and 22 bits,
without a word: MS FC 40 wrote the card of FC 8. sim let ids of 32
bits or more change the fixed bits, so --id 2147483648 simulated id 0,
and printed the shifted frame as Internal Id. The sim help example
used --cn, the option is --id, and the clone hint named lf keri read.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 00:25:21 +01:00
Gabriele GristinaandClaude Opus 5.5 015ee1664e lf paradox: refuse FC above 255 and CN above 65535
clone and sim accepted FC up to 999 and CN up to 99999, but the frame
holds 8 bits of FC and 16 of CN, so FC 300 wrote the card of FC 44.
The clone hint also named lf paradox read, which does not exist.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 00:14:02 +01:00
Gabriele GristinaandClaude Opus 5.5 3e7de8a116 wiegand: fix HPP32, H10320, S12906b, HGen37, format limits, list usage
HPP32 wrote its card number 10 bits past the 32-bit frame, it now uses
bits 13-30 as cardinfo shows. H10320 wrote its first digit over the
leading one, so decode refused most numbers, and two of its parity
masks had typos. S12906b needed ParityValid, which no caller sets.
HGen37 decode checked bit 28 instead of 26. The limits of nine formats
did not match the fields Pack writes. wiegand list printed the usage
of wiegand info.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 23:42:11 +01:00
Gabriele GristinaandClaude Opus 5.5 8024ab5ecb nfc: decode NULL, Lock Control and Memory Control TLVs as specified
A NULL TLV has no length, so a run of them swallowed the TLVs after
it. Lock and Memory Control sizes of 0 mean 256, the nibbles of their
third byte are powers of two and the Memory Control size counts bytes.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:55:23 +01:00
Gabriele GristinaandClaude Opus 5.5 59ec032d03 hf thinfilm sim: let a second simulation wait for its own end
Enter leaves a simulation running on the device, by design. The next
hf thinfilm sim stopped it, took the PM3_EOPABORTED reply left behind
for its own and printed "Done!" at once. A ping round trip before
starting drops that reply.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:43:09 +01:00
abou28andClaude Opus 5.5 508cf2ba7d Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the flash and
CI entries from #3748 and #3750.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:35:37 +01:00
Iceman f90d0d0bf9 Merge pull request #3750 from matrix/fix-ci-codeql-apt-mirror
CI: skip the slow Azure apt mirror in CodeQL too
2026-11-07 05:34:29 +08:00
Iceman ebf59f7adf Merge pull request #3748 from matrix/fix-flash-tty-exit-status
client: flash animation only on a terminal, exit 1 on failure
2026-11-07 05:33:46 +08:00
abou28andClaude Opus 5.5 15ae612ab7 Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the
data rawdemod entry from #3749.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:33:34 +01:00
Iceman 95d248f923 Merge branch 'master' into fix-flash-tty-exit-status
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-07 05:33:34 +08:00
Iceman c127ce940e Merge pull request #3749 from matrix/fix-rawdemod-args
data rawdemod: stop cutting --max, --samples and --p2 clock to 8 bits
2026-11-07 05:31:04 +08:00
Gabriele GristinaandClaude Opus 5.5 2adeaa42a7 CI: skip the slow Azure apt mirror in CodeQL too
CodeQL installs its packages with apt and stalls on
azure.archive.ubuntu.com like the Ubuntu jobs did
(actions/runner-images#14823). #3747 left this workflow out.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:29:46 +01:00
Gabriele GristinaandClaude Opus 5.5 aeb3705237 data rawdemod: stop cutting --max, --samples and --p2 clock to 8 bits
The values went through uint8_t or & 0xFF, so --max 300 ran with 44
and --samples 1000 with 232. The --fs clocks stay 8-bit in the FSK
demod and are now refused above 255.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:27:28 +01:00
Gabriele GristinaandClaude Opus 5.5 49e444b773 client: flash animation only on a terminal, exit 1 on failure
Since cd5906674 the flash animation runs whatever stdout is, and a
redirected flash of fullimage.elf wrote a 7 MB log.

flash_pm3() replaced a flash error with the result of
flash_stop_flashing(), always PM3_SUCCESS, so a failed flash ended with
"All done". main() exited 0 after --flash, --dumpmem and
--reboot-to-bootloader whatever happened. dumpmem printed its negative
error code with %u.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:15:28 +01:00
abou28andClaude Opus 5.5 2e0deeb160 Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the CI and
mfulc_des_brute entries from #3747.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:12:33 +01:00
Iceman 04cac2724b Merge pull request #3747 from matrix/fix-ci-macos-proxspace
CI: fix the macOS and ProxSpace builds, speed up WSL and Ubuntu
2026-11-07 05:10:54 +08:00
Gabriele GristinaandClaude Opus 5.5 1e645dfd0a CI: update checkout, setup-python and upload-artifact to v7
actions/checkout v6 hands the Windows path of its credentials config to
git config --unset as a regex, which MSYS2's git rejects in the
ProxSpace job (actions/checkout#2528, fixed in v7.0.1). The
persist-credentials: false added for it did not help and is dropped.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 22:04:55 +01:00
Gabriele Gristina b1da58a960 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into fix-ci-macos-proxspace
# Conflicts:
#	CHANGELOG.md
2026-11-06 22:03:21 +01:00
abou28andClaude Opus 5.5 f3b83e8094 Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the
recovery.bin entry from #3746.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 21:48:27 +01:00
Iceman 4f4dfeb512 Merge pull request #3746 from matrix/fix-recovery-at91-pad
recovery: pad the AT91 bootrom to 0x102000 again
2026-11-07 04:44:06 +08:00
Gabriele GristinaandClaude Opus 5.5 e9689307c8 CI: skip the slow Azure apt mirror, tidy the ProxSpace job
The Ubuntu jobs drop azure.archive.ubuntu.com from the runner's mirror
list. It sometimes serves at tens of kB/s, held apt-get install for up
to 50 minutes and apt never fails over (actions/runner-images#14823).

The ProxSpace job no longer asks for arm-none-eabi-gdb, which MSYS2
replaced with gdb-multiarch in 2023, and no longer persists the
checkout credentials, whose cleanup failed with MSYS2's git on PATH.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 21:28:47 +01:00
Gabriele GristinaandClaude Opus 5.5 8953c8d88d CI: fix the macOS and ProxSpace builds, build in the WSL file system
mfulc_des_brute added the Homebrew openssl@3.6 include directory, which
the macOS runners no longer have, and -Wmissing-include-dirs under
-Werror stopped the build. It now uses brew --prefix openssl, as #3734
did for mfd_aes_brute.

Since MSYS2 filesystem 2026.10.18 /etc/profile runs post-install
scripts on the first start only, so ProxSpace never installed its
packages and the build found no arm-none-eabi-gcc. The workflow now
runs ProxSpace's setup script when setup\installed is missing.

The third mfulc_des_brute test in pm3_tests.sh is now labelled 3/3.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 20:44:38 +01:00
Gabriele GristinaandClaude Opus 5.5 c73cc293ad recovery: pad the AT91 bootrom to 0x102000 again
caa76f57b ("Fix pm5 recovery image") also moved the AT91 pad from
0x00102000 to 0x00104000, but the AT91 boot area is 8 KB and the OS
image starts at 0x102000. recovery.bin had every fullimage section
0x2000 too high and 0xFF at the OS entry, so a JTAG recovery would
leave the bootrom in flash mode.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 19:10:29 +01:00