Commit Graph
23377 Commits
Author SHA1 Message Date
歐歪andClaude Opus 5 c512212e53 doc: regenerate commands.md and commands.json
Picks up the hf 15 csetuid and hf 15 cfinalize help text changes, plus the
hf ntag424 commands added earlier on this branch.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-22 21:08:19 +08:00
歐歪andClaude Opus 5 46f0dfeb93 doc: 15693 V3 finalize erases the whole tag memory
The notes said block 0x15 reads back as 69 E2 5D 00 after finalize. It reads
back as 00 00 00 00, and so does every other block.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-22 21:08:19 +08:00
歐歪andClaude Opus 5 14a5de0bdf fix: let the device verdict decide the outcome of hf 15 csetuid
The client only inspected PM3_EWRONGANSWER and then re-verified with its own
getUID(), which asks whether the tag carries the requested UID, not whether
this command wrote it. Running csetuid --v3 twice with the same UID printed
"Setting new UID ( ok )" on the second run even when the device had reported
PM3_ESOFT, because the UID written by the first run still matched.

Gen1 and V3 now switch on the device status, which already covers tag
identification and UID verification. V2 keeps the client side comparison,
the device does neither for it. PM3_ETIMEOUT is handled as well, cfinalize
already did that.

The cfinalize help text and its confirmation warning said the configuration
area is erased. Finalize erases the whole tag memory to 00000000.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-22 21:08:18 +08:00
歐歪andClaude Opus 5 6795573bd4 fix: harden ISO15693 magic tag probing on the device side
magic_15_read_blk() rejected any read whose response was not 7 or 8 bytes
and magic_gen1_is_backdoor() read that as "backdoor register", so a normal
tag with a block size other than 4 answered with 12 bytes and was classified
as safe to overwrite. It now reports the payload it got and the Gen1 probe
tests all of it for zero, so any answer with data means a normal tag
whatever its block size.

Both helpers verify the response CRC now, GetIso15693AnswerFromTag() leaves
that to the caller.

magic_v3_in_config_mode() becomes magic_v3_read_config(), which separates
"the signature blocks could not be read" from "they were read and hold
something else". FinalizeTag15693_v3() took the first as proof the lock had
taken, so a tag lifted off the antenna right after the finalize writes
reported success. The two reads share the receive buffer, so block 0x14 is
compared before 0x15 is requested.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-22 21:08:09 +08:00
歐歪 13d8d7ddf3 Merge branch 'RfidResearchGroup:master' into 20260917-15magic-fix 2026-09-22 16:34:08 +08:00
歐歪 dfa3255fd6 fix: refine hint messages for V3 tag finalization status 2026-09-22 16:30:43 +08:00
Iceman 983b466ca1 Merge pull request #3656 from 0x6r1an0y/20260922-15693magic-docs
Fill in the ISO15693 magic notes
2026-09-22 07:00:20 +07:00
Iceman be8a0d524e Merge pull request #3657 from 0x6r1an0y/20260922-makefile-fix
fix: preserve UTF-8 in generated command docs
2026-09-22 06:59:35 +07:00
Iceman 12899dc2e8 Merge pull request #3658 from Axi-ohm/fix/bigbuf-align-mask-32bit
BigBuf: widen BIGBUF_ALIGN_MASK to 32-bit for PM5
2026-09-22 06:57:56 +07:00
Axi-ohmandClaude Opus 4.8 3f8edc5563 BigBuf: widen BIGBUF_ALIGN_MASK to 32-bit for PM5
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-09-21 18:34:23 -05:00
歐歪andOpenAI Codex 940f26ce37 build: centralize Python executable definition
Co-Authored-By: OpenAI Codex <noreply@openai.com>
2026-09-22 07:24:43 +08:00
歐歪 5360980b48 doc: 15693 wipe command would brick the v3 tag for now 2026-09-22 07:14:31 +08:00
歐歪andClaude Opus 5 f0a502b279 refactor: move ISO15693 magic tag handling to the device side
Identification, writing and failure handling for magic Gen1 and V3 tags
now runs in a single field session on the device, which reports
PM3_SUCCESS only when the UID reads back as requested.

armsrc/iso15693.c:
- SetTag15693Uid() probes 0x38/0x39/0x3E/0x3F and refuses to write when
  any of them answers with data, verifies the UID afterwards and blanks
  the four blocks again when it did not change.
- SetTag15693Uid_v3() and FinalizeTag15693_v3() are new, both check the
  0x14/0x15 configuration signature before writing and verify after.

client/src/cmdhf15.c:
- csetuid and cfinalize now only select a command and print the status.
  The V3 block helpers and constants move to armsrc, which restores the
  original read helper with its CALLOC message and the
  ISO15_ERROR_HANDLING_* macros.

Behaviour change: hf 15 cfinalize without -y no longer energizes the tag
and no longer reports configuration mode before asking for confirmation.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-22 07:04:16 +08:00
iceman1001andClaude Opus 5 4cca8df3a0 hf mfu: support UL-AES in restore, fix info config output
restore refused UL-AES outright.  The generic page plan assumes the last
four pages are cfg0/cfg1/PWD/PACK, which on UL-AES are the AES keys, so
the data loop walked over the lock page, both config pages and the key
lock bits at 0x2D.  Give UL-AES its own plan: user memory 0x04..0x27,
and lock/cfg0/cfg1 behind -s.  Key pages 0x30..0x37 are left alone, the
dump only ever carries AESKey0 and 0x34..0x37 read back as zeros.

info never printed the UL-AES config.  ulaes_print_configuration() is
called with 0x29 but its first branch tested for 0x2C, so cfg0 and cfg1
fell through to the bare return and only the CMAC page showed up.

info also read page 0x34 as if it were an EV1 config page.  That is the
UIDRetrKey.  Genuine silicon NAKs the read, but a magic or simulated
card would have had its key printed as cfg0/cfg1/PWD/PACK.

Tested on a UL-AES with AUTH0=4, PROT set and secure messaging on.
Restore of an unmodified dump comes back byte identical; a dump carrying
DEADBEEF at 0x27 and CAFEBABE at 0x2B writes 0x27 and leaves 0x2B alone.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-09-22 00:23:02 +02:00
歐歪andOpenAI Codex 6775a78a10 fix: preserve UTF-8 in generated command docs
Transcode the MinGW client's CP850 output before writing command documentation and force Python to read the converted stream as UTF-8. Normalize the remaining escaped Greek mu strings to the project's micro sign convention.

Co-Authored-By: OpenAI Codex <noreply@openai.com>
2026-09-22 05:37:09 +08:00
歐歪 4ea8207400 doc: 15693 magic card 2026-09-22 04:32:14 +08:00
歐歪andClaude Sonnet 5 e74bb0f2e5 fix: 15693 csetuid v1 probe, single session write and safer rollback
- probe: only no answer / block not available count as unreadable, other read errors abort
- 69960000 is only accepted in 0x3F, the other blocks must be blank
- write 0x3E/0x3F/0x38/0x39 in one RF session
- rollback only when the tag still shows its original UID, message lists all four blocks

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-22 03:25:47 +08:00
歐歪 cd24d8b0b0 fix: rewind if 0x38 0x39 write fails 2026-09-21 18:27:45 +08:00
歐歪 f7a9682a9e fix: silent v1 pre-check and refine the commands 2026-09-21 18:06:42 +08:00
歐歪 473dcb0aa5 fix: v1 tag probing fail message clear 2026-09-21 17:34:37 +08:00
歐歪 e1e023ea61 feat: 15693 csetuid v1 v3 check before write 2026-09-21 17:11:23 +08:00
Philippe Teuwen 6150d8fc57 "Starting today in version 2.1.277, if there is no CLAUDE.md in a folder, Claude will check for and use AGENTS.md." 2026-09-19 21:02:32 +02:00
dxl 2c955d7deb Fixed bug on the PM5 platform where changing PM3_CMD_DATA_SIZE to a larger value broke compatibility for certain commands. 2026-09-18 21:56:29 +02:00
dxl d5ef826587 Before sending data via the SSC, it is best to ensure that the transmitter is ready (TX ready). 2026-09-18 21:56:29 +02:00
dxl 38e06eec5a Fixed a bug on the PM5 platform where an CSPAS error caused a SPI_SSC hang, resulting in random device freezes. 2026-09-18 21:56:29 +02:00
Philippe Teuwen 431f553bfa Fix ProxSpace CI for tagged commits
MSYS2 git fails with
C:\ProxSpace\msys2\usr\bin\git.exe rev-parse refs/tags/v4.23346^{commit}
  Error: fatal: ambiguous argument 'refs/tags/v4.23346^commit': unknown revision or path not in the working tr

GitHub's windows-latest hosted runner images ship with Git, so let's use it
2026-09-18 11:26:49 +02:00
Shawn Hoffman 3c1af8e077 ntag424: implement GetTTStatus and SetConfiguration
fix bug in changekey's keyversion param handling
2026-09-18 00:59:15 +02:00
Philippe Teuwen bed32b1458 standalone modes alphabetical order 2026-09-18 00:52:30 +02:00
Philippe Teuwen 731814f67d changelog 2026-09-18 00:23:52 +02:00
Philippe Teuwen e2acee8a85 Revert "Release v4.23346 - Frosty Lemon"
This reverts commit dc0110c29d.
2026-09-18 00:22:18 +02:00
Philippe Teuwen dc0110c29d Release v4.23346 - Frosty Lemon v4.23346 2026-09-18 00:22:18 +02:00
Philippe Teuwen 67f66ab3d9 prepare release 2026-09-18 00:21:27 +02:00
Philippe Teuwen 7822cbd8b1 silent gcc warnings on ARMHF architecture
The warnings are false-positive: resp.data is a union of uint8_t asBytes[] and uint32_t asDwords[], so the buffer is actually 4-byte aligned — but casting uint8_t* directly to a stricter-aligned struct pointer trips -Wcast-align. Fix by routing through (const void *)
2026-09-17 22:53:58 +02:00
Philippe Teuwen b3beffd59b docker tests 2026-09-17 22:48:34 +02:00
Philippe Teuwen afb55e196a Allow skipping setcap, to ease dockerized release tests 2026-09-17 16:59:19 +02:00
Philippe Teuwen 90c41c6de5 use arraylen 2026-09-17 00:23:18 +02:00
Mistial DeveloperandGPT-Daybreak Blue 8ed285af90 feat(desfire): add DFC credential interoperability
Add bidirectional conversion between DFC v4 credentials and mfdes v1 JSON, with documentation and round-trip coverage. Include H10301 FC69 CN420 factory and field fixtures and an external HID reader test target.

Co-Authored-By: GPT-Daybreak Blue <noreply@openai.com>
2026-09-17 00:08:06 +02:00
Mistial DeveloperandGPT-Daybreak Blue 957896a926 build(desfire): make emulator test hook optional
Exclude the USB test dispatcher and queued-random support from normal firmware builds. Enable them with ENABLE_HFMFDESETEST=1 when running emulator vectors.

Co-Authored-By: GPT-Daybreak Blue <noreply@openai.com>
2026-09-17 00:08:06 +02:00
Mistial DeveloperandGPT-Daybreak Blue 50f6b76469 feat(desfire): handle ISO 7816 selection in simulator
Recognize interindustry SELECT APDUs by DF name or file identifier and return card-compatible status words.

Co-Authored-By: GPT-Daybreak Blue <noreply@openai.com>
2026-09-17 00:08:06 +02:00
Mistial DeveloperandGPT-Daybreak Blue a8e347ddb9 fix(desfire): stabilize simulator RF exchanges
Constrain activation to supported bit rates, ignore invalid polling and frames, and follow independent ISO-DEP block sequences during recovery.

Co-Authored-By: GPT-Daybreak Blue <noreply@openai.com>
2026-09-17 00:08:06 +02:00
Mistial DeveloperandClaude Fable 5.1 2b35f40c95 hf mfdes sim: legacy secure messaging after a 0x0A authentication
A session opened with 0x0A kept the EV1 secure messaging: an 8 byte CMAC
on every answer, CRC32 in enciphered transfers and ChangeKey, one CBC
chain across commands. The legacy session is different in every one of
those: nothing on a plain answer, a 4 byte DES MAC over the data alone on
MACed transfers, CRC16 over the data in enciphered transfers and in the
ChangeKey cryptogram, the reader's cryptograms undone by enciphering, and
every cryptogram from a zero IV.

The session remembers which authentication opened it and the four places
that secure or check a transfer take the legacy path when it was 0x0A:
the write gatherer's expected length, the command unwrap, the answer
wrapping, and ChangeKey. Chained answers carry the transfer's mode so a
MACed read puts its MAC on the last frame only.

Measured against a genuine DESFire EV1 4K with the pm3 as reader, all
zero and non-zero DES keys, writes and reads in all three modes and a
ChangeKey of another key: the simulation answers every frame with the
card's bytes.

Co-Authored-By: Claude Fable 5.1 (claude-fable-5-1) <noreply@anthropic.com>
2026-09-16 22:14:07 +02:00
Mistial DeveloperandClaude Fable 5.1 49a19be247 hf mfdes sim: run the 0x0A legacy authentication the way a card does
The second frame of a 0x0A handshake was handled like 0x1A: the reader
token was deciphered in CBC with the IV chained from E(RndB), and RndA'
was enciphered with the IV chained from the token. A card starts each
legacy cryptogram from a zero IV and only ever enciphers, so it recovers
the token by enciphering each block and xoring the previous ciphertext
block.

The wrong IV only touches the token's first block, so RndB' still
verified and the simulation reported success with RndA off by E(RndB).
Session key and final frame were wrong from there, which is where the
D40 secure messaging captures started to disagree.

Measured against a genuine DESFire EV1 4K: the card's final frame is the
same across sessions with different RndB, which only a zero IV gives,
and the simulation's old answer matched the chained-IV arithmetic byte
for byte. Both handshake captures now replay through the simulation.

Co-Authored-By: Claude Fable 5.1 (claude-fable-5-1) <noreply@anthropic.com>
2026-09-16 22:04:01 +02:00
Mistial DeveloperandClaude Fable 5.1 fee9648b53 hf mfdes etest: place the command doc entry at top level, state the draw order
The regenerated `hf mfdes etest` object had been spliced inside the
`hf mfdes esave` object in doc/commands.json, so catalog consumers did
not see it. Moved by hand to its place among the commands, matching what
`make commands` produces for that entry.

Help and how-to said a recorded session replays byte for byte. It does
only when the queue is filled in draw order: the random UID takes 3 bytes
at --scan on a random-id image, then each authentication takes its RndB.
Say so.

Co-Authored-By: Claude Fable 5.1 (claude-fable-5-1) <noreply@anthropic.com>
2026-09-16 22:04:01 +02:00
Mistial DeveloperandClaude Fable 5.1 deab288804 hf mfdes etest: changelog and how-to
Co-Authored-By: Claude Fable 5.1 (claude-fable-5-1) <noreply@anthropic.com>
2026-09-16 22:04:01 +02:00
Mistial DeveloperandClaude Fable 5.1 2ff6b0fecd hf mfdes etest: drive the DESFire simulation from the host
One command with one action per call: --begin, --scan, --apdu <hex>,
--random <hex>, --fieldoff, --state, --end. Text output by default,
-j gives one line of JSON per call for a script to read back.

Distinct failures are reported as such: no image in emulator memory,
not activated (--scan first), random queue full, and a firmware that
does not answer.

Co-Authored-By: Claude Fable 5.1 (claude-fable-5-1) <noreply@anthropic.com>
2026-09-16 22:04:01 +02:00
Mistial DeveloperandClaude Fable 5.1 e588085c10 hf mfdes sim: host driven test hook with injectable randomness
The DESFire simulation could only be reached over the air. A conformance
suite that has recorded a genuine card's session needs to replay it byte
for byte, which takes two things the simulation did not have: a way in
over USB, and control of the card's random draws.

CMD_HF_DESFIRE_SIM_TEST carries one operation per packet into the same
state machine the RF loop drives: BEGIN, SCAN, APDU, RANDOM, FIELDOFF,
STATE, END. SCAN runs the RF-reset path (init, reset, random id, FSD) and
APDU goes through desfire_sim_apdu(), so native and ISO 7816 wrapped
commands answer exactly as they do on air. No FPGA involvement.

Randomness goes through a small host-fed byte queue: RndB and the random
id draw from it first and fall back to the existing fixed value or tick
counter when it is short, raising a sticky underflow flag. With nothing
queued the RF simulation is byte-identical to before; SimulateDesfireTag()
clears the queue so a host session cannot leak into a reader session.

Co-Authored-By: Claude Fable 5.1 (claude-fable-5-1) <noreply@anthropic.com>
2026-09-16 22:04:01 +02:00
CinderSocketandgpt-daybreak-blue 71b558d6be usb: consume zero-length OUT packets and already buffered commands
A transfer whose size is an exact multiple of the endpoint size ends with
a zero-length packet. Nothing acknowledged it, so that receive bank stayed
selected and data queued in the other bank stalled. A command already
buffered by usb_read_ng was also not recognised until another packet came
in. Both AT91 and AT32 reuse their receive cleanup to acknowledge the empty
packet and rearm reception; frame parsing is unchanged.

Seen as a small packet lost now and then right behind a burst of
CMD_HF_MIFARE_EML_MEMSET chunks from `hf mfdes eload`.

(cherry picked from cindersocket/proxmark3 495bc201d, upstream PR #3628)

Co-Authored-By: gpt-daybreak-blue <noreply@openai.com>
2026-09-16 22:04:01 +02:00
Philippe Teuwen 1d887fa869 make miscchecks 2026-09-16 19:06:43 +02:00
Philippe Teuwen 634edd11fd make style 2026-09-16 19:00:50 +02:00
iceman1001 f1e71c5b69 ulaes config fix 2026-09-16 18:58:42 +02:00