Commit Graph
23733 Commits
Author SHA1 Message Date
Iceman ebd33229e3 Merge pull request #3742 from abou28/em4x50-liw-sync-fix-pr
em4x50: sync RM on the second listen window
2026-11-09 11:07:21 +08:00
Iceman a87e8cb014 Merge branch 'master' into em4x50-liw-sync-fix-pr
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-09 10:50:17 +08:00
Iceman 19bbcedf6b Merge pull request #3761 from towelbyte/cotag_sim_passive
`lf cotag sim` - add and default to passive mode, improve field drop and activation sequence detection
2026-11-09 10:49:32 +08:00
Iceman 58ce7278e4 Merge branch 'master' into cotag_sim_passive
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-09 10:47:45 +08:00
Iceman ecef4e89ca Merge branch 'master' into em4x50-liw-sync-fix-pr
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-09 10:47:06 +08:00
Iceman 299be31710 Merge pull request #3766 from matrix/fix-noralsy-limits
lf noralsy: refuse CN above 9999999 and years outside 1961-2060
2026-11-09 10:17:53 +08:00
Gabriele GristinaandClaude Opus 5.5 5fb4d6b250 lf noralsy: refuse CN above 9999999 and years outside 1961-2060
clone and sim encoded only 7 BCD digits of the CN and the last two
digits of the year, which the demod maps to 1961-2060, so
--cn 12345678 wrote card 2345678 and --year 1950 the year 2050.
Both values were also cut to 32 and 16 bits first.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 17:47:43 +01:00
towelbyte c9a2946e83 lf cotag sim: passive mode: catch a re-activation right after a field drop
Some COTAG readers produce two ON(x),OFF(y),ON(z) activations in a row, with
a very short gap in between, but they actually listen for the card response
only after the second activation.

Real COTAG tags respond to both activations, but correctly
detect a field drop after the first ON(z) and reset.

The proxmark COTAG sim code was detecting a field drop, but due to various
delays (unnecessary settle, possible printouts) in such cases then missed
the second activation.

Fix the problematic delays. Also, optimize the activation
detection by carrying the adaptive threshold across calls.
2026-11-08 13:10:45 +01:00
towelbyte 93631d06d7 lf cotag sim: COTAG simulation improvements
- Implemented passive mode for COTAG sim:
- load modulation with an fc/2 subcarrier locked to the reader carrier.
    - This mode is now a default as it has several advantages:
        - phase coherent response,
        - can detect reader field drop mid frame "transmission" and restart
          immediately -- important with some readers that may drop field
          early and send reactivation shortly afterwards expecting the
          tag to respond there as well.

- "active tx mode" is now via CLI toggle --active: it may give better range,
but may not work with all readers.

- Improved COTAG activation sequence detection for a wider range of COTAG
readers that may vary slightly in activation sequence timings (thresholds
for the rise-to-rise mode).
2026-11-08 13:10:45 +01:00
abou28andClaude Opus 5.5 537114da6c em4x50: keep the PR to the listen window fix
Per review, drop `lf em 4x50 config`, lf_em4x50_tune.lua, the debug
capture and the doc/commands.* changes. Reader timings go back to the
upstream constants; only the RM delay is new (132 cycles, centre of
the 104-164 range that worked).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 08:50:34 +01:00
abou28andClaude Opus 5.5 a22ed6f6bb Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the entries
from #3762.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 08:50:11 +01:00
Iceman 3810eee3e0 Merge pull request #3762 from matrix/fix-trace-list
trace list/extract: frame bounds, CRC checks and annotation fixes
2026-11-08 15:39:48 +08:00
Iceman 699e528db9 Merge branch 'master' into fix-trace-list
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-08 15:39:37 +08:00
abou28andClaude Opus 5.5 e30c7a7ccb Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the entries
from #3754.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 04:20:12 +01:00
Iceman 958058e876 Merge pull request #3754 from matrix/fix-indala-fc-cn
lf indala: --fc/--cn parity and checksum as on genuine cards
2026-11-08 11:17:05 +08:00
Iceman 43890115f5 Merge branch 'master' into fix-indala-fc-cn
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-08 11:16:43 +08:00
abou28andClaude Opus 5.5 9f910d7ff7 Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the entries
from #3763, #3764.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 04:15:37 +01:00
Iceman b9be753dc5 Merge pull request #3763 from matrix/fix-hitag-commands
lf hitag: refuse bad pages and data, fix eview, Paxton and LCK1 output
2026-11-08 11:14:35 +08:00
Iceman d6eb6bb1d0 Merge branch 'master' into fix-hitag-commands
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-08 11:14:04 +08:00
Iceman 1df43cce4f Merge pull request #3764 from matrix/fix-noralsy-demod
lf noralsy demod: stop losing reads to one demod error, accept BB0314FF
2026-11-08 11:11:47 +08:00
Gabriele GristinaandClaude Opus 5.5 a70f0adec8 lf noralsy demod: stop losing reads to one demod error, accept BB0314FF
ASKDemod_ext() was called with maxErr 0. The error is most often the
cut first bit of the read, outside every frame. cmdlfgallagher.c passes
100 in the same call since dfb7eaf06, and a frame still has to pass
both checksums.

A 0xBB0314FF first block, which getnoralsyBits() notes as seen, no
longer gets the unknown bits warning. The example in the comment is
such a card, its hex column said BB0214FF.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 03:55:51 +01:00
Gabriele GristinaandClaude Opus 5.5 96ad2981bd lf hitag: refuse bad pages and data, fix eview, Paxton and LCK1 output
The page check covers the Hitag 2, S and µ `wrbl`, the data check S and
µ. `htu rdbl -c` stops at the 55 blocks the reply holds, `hts -m` above
3 is refused, `ta -h` shows its help and argument errors free the
parser.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 02:08:02 +01:00
abou28andClaude Opus 5.5 55aa198a04 Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the entries
from #3758.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 01:24:56 +01:00
Iceman bf3d37e00a Merge pull request #3758 from matrix/fix-destron-sim
lf destron: implement sim, refuse uids the frame can't carry
2026-11-08 08:23:00 +08:00
Iceman 46a5a7209f Merge branch 'master' into fix-destron-sim
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-08 08:22:37 +08:00
Gabriele GristinaandClaude Mythos 5.1 c6dc5ef1bb trace list/extract: frame bounds, CRC checks and annotation fixes
Annotators, `trace extract`, `-x` and `-c` stay inside the frame, the
trace and the row buffer, `-t ht2` inside the Hitag 2 state, and frame
lengths are 16 bit wide. Topaz, FeliCa and five byte ISO14443-A frames
get the right CRC check, Topaz and iCLASS traces tell their ISO14443-A
and ISO15693 frames apart, and the SEOS, 14b, DESFire and Hitag µ
labels are corrected. Six make check expectations on the repository
traces cover the fixes.

Co-Authored-By: Claude Mythos 5.1 <noreply@anthropic.com>
2026-11-08 01:18:04 +01:00
abou28andClaude Opus 5.5 6c6032f4de Merge upstream master into em4x50-liw-sync-fix-pr
Resolve CHANGELOG.md: keep both the EM4x50 entries and the entries
from #3759.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 01:05:06 +01:00
Iceman 444c703b37 Merge pull request #3759 from matrix/fix-fdxb-iso
lf fdxb: ISO 11784 fields, Bio-Thermo clone/sim, sim and reader fixes
2026-11-08 08:03:00 +08:00
Iceman 6f3c6759d9 Merge branch 'master' into fix-fdxb-iso
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-08 08:02:48 +08:00
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 15811614a6 Merge branch 'master' into fix-destron-sim
Signed-off-by: Iceman <iceman@iuse.se>
2026-11-08 07:58:25 +08: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
Gabriele Gristina eea78faeeb Merge remote-tracking branch 'origin/master' into fix-indala-fc-cn
# Conflicts:
#	CHANGELOG.md
2026-11-07 22:18:56 +01:00
Gabriele GristinaandClaude Opus 5.5 745c78d29e lf fdxb: ISO 11784 fields, Bio-Thermo clone/sim, sim and reader fixes
demod splits the starting digit from the reserved bits, writes the
animal code as CCC NNNNNNNNNNNN, knows all 249 ISO 3166-1 countries
and shows Bio-Thermo only for the chips' exact trailer. clone and sim
refuse values the frame can't carry, sim sends the data block flag for
--extended 000000 and stops with Enter, reader also tries 125 kHz.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 22:07:54 +01:00
Gabriele GristinaandClaude Opus 5.5 5bc67a0d1c lf destron: implement sim, refuse uids the frame can't carry
lf destron sim only printed "To be implemented". It now sends the
frame that lf destron clone writes, FSK2 RF/50 as in the clone's T5577
config. Both take 5 bytes of 00-7F: clone wrote a byte above 7F
without its top bit and padded a short uid with FF of bad parity.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-07 20:01:51 +01: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
Gabriele Gristina f5372c4d9f Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into fix-indala-fc-cn 2026-11-07 02:45:35 +01: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
Gabriele Gristina 6a365952c0 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into fix-indala-fc-cn 2026-11-07 02:42:12 +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