The trace buffer was cleared before the load, so a missing or empty
file lost the trace already loaded. Loading straight into gs_trace also
left it dangling when loadFile_safe() freed it on a short read, to be
freed again by the next clear or load. Load into a local buffer and
swap it in on success.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A PM5 BigBuf is several hundred KiB, so its traces outgrow the 16 bit
trace length and record positions. The device already reports the
length as 32 bit in download_done_t.extra, but download_trace_ex() kept
it in a uint16_t and cut it modulo 65536, as `trace load` did for files.
Make the client side trace length and every record position 32 bit, and
drop the 64 KiB refusal from d36d821c5.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The trace buffer length and all record positions are 16 bit. `trace
load` and the spiffs import (ImportTraceBuffer took a uint16_t, its
caller passes a uint32_t) cut a longer length modulo 65536, eg a 70005
byte file loaded as 4469 bytes. Report it and keep the buffer empty.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Same order as the native branch. No change in output, the reply is a
tag frame the next pass ignores anyway.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
They were matched on the low nibble of the first byte only. A 14a CL2
SELECT, 95 70 UID BCC CRC, is 9 bytes like a CHECK and was printed as
its MACs, and a MIFARE AUTH B, 61 .., was taken as a SELECT and ate the
frame after it.
A SELECT now needs CSN[8] and a reply with a valid iCLASS CRC, which is
only skipped when it matched. A CHECK carries no CRC, so a frame with a
valid CRC_A is not one.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
They are static and were never cleared, so an iCLASS CHECK in a trace
without a SELECT gave an `hf iclass lookup` line with the CSN and epurse
of a trace extracted earlier.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Both ignored the result of download_trace(). After a timeout they went
on with whatever the client side trace buffer held, ie an older trace,
under a fresh "Recorded activity" line. Offline they printed the failed
upload error and then listed the buffer anyway.
Download only when a device is present and return its error, offline
uses the trace buffer like `trace save` does. The "removing parameter
-1" hint is only given when -1 was.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Any reader frame with the top two bits clear was searched for an auth
command at its first two INF bytes. A MIFARE Ultralight READBLOCK(10),
30 0A CRC, was reported as a native DESFire auth with the CRC byte as
key number and page data as challenge (traces/hf_14a_mfuc.trace), and
so was a native SelectApplication of an AID starting with 0A.
Require an I-block PCB, take the command after CLA 90 only when the
frame is wrapped, and the key number before the CRC. long_jmp now
follows the framing instead of guessing it from the frame length.
The switch loses one indent level, see git diff -w.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The ISO auth branch took a tag reply longer than 20 bytes as 3TDEA. A
native 3TDEA reply is 20 bytes, so it was shown as 2TDEA with half the
challenge. Use what is left after the framing, SW and CRC instead.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The OP card manager SELECT built its sAPDU_t from a static AID, so
clang emitted a constant template with an absolute pointer at offset 5
of the PACKED struct. Apple ld rejects it:
ld: pointer not aligned in 'l___const.gp_info.op'+0x5 (cmdhfgp.o)
Keep the AID on the stack, like the other sAPDU_t users.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The tag challenge of the DES, ISO and AES auth branches was read from
frame + 1. In native framing that is the AF status byte, and with a CID
it is the CID byte, so the challenge came out shifted by one, eg
traces/hf_mfdes_sniff.trace gave 000675359294E7CD instead of
0675359294E7CDA1.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The MFDES AES auth branch printed 8 of the 16 RndB bytes and 16 of the
32 reader bytes, and accepted a 9 byte tag reply.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The retry check estimated the next attempt from the longest one so far.
That does not bound it:
- get_pulse_length() waits up to 4 bit periods
- one find_double_listen_window() can take about 3.2 s with no signal
- a login + read attempt can take over 6 s
- setup before tstart was not counted
A slow attempt after fast failures could end after the client gave up,
leaving the late reply queued for the next command.
read and info now set a deadline after setup, 1 s before the client
timeout. The listen window, ACK and word decode loops stop at the
deadline, as do the retries. With no deadline set (write, brute, sim,
...) they behave as before. The client waits 5 s for read, as it
already did for info / dump.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Makefile.defs hardening sets -D_FORTIFY_SOURCE=3. Under clang, glibc's
stdio2.h then defines fprintf as a macro, so the stdout hook in
deps/reveng/config.h redefined it and -Werror stopped the build in
bmpbit.c, cli.c, model.c, poly.c, preset.c and src/cmdcrc.c. Undefine
fprintf, fputs and puts before hooking them.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
brew's "openssl" alias follows the newest major (now openssl@4), so
`brew --prefix openssl` returns a prefix that isn't installed on setups
with only openssl@3, and the build fails with evp.h / des.h not found.
Probe the candidate kegs and use the first that actually has the headers.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
hf gp info also tries the OpenPlatform card manager AID
A000000003000000 before falling back to the default applet. That
fallback now warns and is titled "Default applet" instead of
"Security Domain".
hf gp aids returns PM3_ESOFT when the card accepts any SELECT, instead
of PM3_SUCCESS.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- SW1 SW2 colouring wrote past line[] / sw_escapes[] for responses over
648 bytes. It is now limited to the rows actually printed (324 bytes),
like the CRC marker.
- The session opens on the ATS, not on RATS, so an ATS whose TL byte
looks like an I-block PCB is no longer decoded as an APDU response.
If no ATS was captured, the next reader frame opens the session.
- A command is decoded as an APDU only if Lc / Le matches the INF
length (ISO 7816-4 cases 1-4, short and extended). A response is
decoded only when it answers such a command. This keeps native
DESFire and similar I-blocks from being labelled as APDUs or coloured
as status words.
- `trace list -t 7816` and `-t fmcos` reset the 14a-4 session state
at the start, like the other 14a listings.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Next attempt must fit in 2.5 s, judged by the longest attempt so far.
Client waits 5 s for info/dump.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
New `hf gp` command family. Every subcommand works without keys and
never sends INITIALIZE UPDATE / EXTERNAL AUTHENTICATE, so no card
retry counter is used. All take -w for the contact interface, -a to
log APDUs and -v for verbose output.
hf gp info
Selects the ISD, or the default applet when A000000151000000 is
absent, and reads:
- Card Recognition Data, decoding the GP version, SCP and Java Card
version from their OIDs
- CPLC, with the fabricator name and BCD dates decoded
- the Key Information Template (KVN, key id, type, length, with
SCP02 / SCP03 key sets marked)
- IIN, CIN and the SCP sequence counter
GET DATA retries with CLA 00 on cards that reject CLA 80.
hf gp crs
GET STATUS on the Contactless Registry Service (GPC_SPE_025 3.11),
following 6310 to fetch more data. Lists each applet's AID,
lifecycle, contactless activation state, display data, URL, group
and CREL members. --aid filters on a full or partial AID.
hf gp aids
Finds applet AIDs by partial SELECT (P2=00, first occurrence):
- finds the shortest prefix the card accepts
- tries aidlist.json prefixes and every registered RID A0 00 00 0x xx
(--quick skips the RID sweep)
- extends each hit one byte at a time to the full AID
- --prefix limits the search to one subtree
Cards whose default applet accepts any SELECT are detected and
refused. The walk is capped at 200000 APDUs and can be stopped with
<Enter>. Without partial selection it falls back to the full
aidlist.json AIDs.
aidlist.json gains the GP ISD, CRS and ARA-M AIDs, plus USIM, ISIM,
CSIM, UnionPay, and ICCOA so found AIDs get named. The CCC digital key entry gets a description.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Inside an ISO14443-4 session, now decodes I-blocks
as APDUs instead of passing them to the plain 14a annotator.
- A session opens on RATS and closes on WUPA, REQA, HLTA, S(DESELECT)
or a new trace. Only I-blocks with a valid CRC_A are decoded.
- Commands are named by INS (SELECT FILE, GET CHALLENGE, ...), or shown
as 'APDU CLA xx INS yy'. The first block of a chain is marked
'(chained)'. Continuation blocks are skipped.
- CID and NAD bytes are skipped. CLA FF and INS 6x / 9x are rejected
as not being APDUs.
- Responses show the status word text only for errors. 9000 and 61xx
stay quiet.
- The reader's S(DESELECT) is labelled.
- With colours on, SW1 SW2 of a response APDU are shown in cyan.
annotateIso14443aLastHasSW() tells cmdtrace when the last frame had a
status word.
The ISO7816 INS name switch moves into iso7816_ins_name(), shared by
annotateIso14443a() and annotateIso7816(). The output of
does not change.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
StartCountSspClk() declared its tmr_input_config_type on the stack
without initialising it and never set input_filter_value.
tmr_input_channel_init() copies that field into TMR2 CM1.C2DF, so the
digital input filter on the ssp_clk pin took whatever low nibble was
left on the stack, and could change from call to call depending on
the caller's stack contents.
TMR2 is clocked by that filtered input (C2DF2, external clock mode A),
so the filter decides which ssp_clk edges get counted. With fDTS at
288 MHz, filter values around 13 need ~556 ns of stable input against
a ~590 ns ssp_clk half period (fc/16 in 14a reader modes). Edges are
then dropped some of the time, and 14-15 drop every edge. In sniffer
mode (fc/8) values from about 10 already break. Lost ticks delay
frame timing derived from GetCountSspClk() (ReaderTransmit timing,
sync_time loops) by a varying amount. This shows up as random nonce
distance jitter and slow distance calibration in hf mf nested/autopwn
on PM5.
Zero-initialise the struct so the filter is off (C2DF = 0), matching
StartLoEdgeCapture() in the same file.
Reported by @adrian-stepien in #3709.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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>
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.
- 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).
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>
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>
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>