Commit Graph
22832 Commits
Author SHA1 Message Date
Iceman 2da2fda378 Merge pull request #3570 from pkilar/hf14b-wtx-timeout
hf 14b: scale the WTX timeout, not the shift
2026-09-01 23:27:02 +07:00
Philippe Teuwen 0cde2124c8 Replace pm3_max_cmd_data_size() by g_conn.max_cmd_data_size 2026-09-01 17:58:14 +02:00
Philippe Teuwen b69fa20233 Precompute max_cmd_data_size in TestProxmark 2026-09-01 17:58:07 +02:00
Niel Nielsen c22d2a7894 make style
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen 37479f04b1 make style
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen ee22d0712e make style
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen 9e1b63edce make style
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen ef0b357c7a Add files via upload
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen f8a0ed0096 Add files via upload
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen 769dc479c2 Conditionalize PM3_CMD_DATA_SIZE based on device
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen d0261484af Add files via upload
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen db35ed4854 Add files via upload
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen e25bae7032 Add files via upload
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen a410d2c252 Add files via upload
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen 8a68a1cc88 Add files via upload
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen 23175240e8 Add files via upload
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen 9df1c62ec5 Add files via upload
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen 3628681a50 Add files via upload
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen 8de138380b Delete client/src/mifarehost.c
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen 6b2b6f2bb1 Fix remaining PM3_CMD_DATA_SIZE
100 array declarations uint8_t x[PM3_CMD_DATA_SIZE]
21 receive sites — GetFromDevice, APDU/smartcard response buffers

All in a days work

Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen fa8a7da45d Fixed missing arrays
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen 9f0171a706 Add files via upload
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen 8ad242ad74 Add stack size definition to ldscript for AT32
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen d99fc10609 Limit KEYS_IN_BLOCK to a maximum of 255
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen c521e9f641 Remove KEYS_IN_BLOCK definition
Removed the definition of KEYS_IN_BLOCK from mifaredefault.h.

Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen dbadc2b8e0 Update MFC_CHKKEYS_FAST_MAX_KEYS definition
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen 2059eba7fa Add KEYS_IN_BLOCK definition to mifaredefault.h
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Niel Nielsen d8537a1a6c Conditionalize PM3_CMD_DATA_SIZE based on device
Signed-off-by: Niel Nielsen <nieldk@gmail.com>
2026-09-01 17:57:31 +02:00
Paul KilarandClaude Opus 5 1a6255ad84 hf 14b: scale the WTX timeout, do not scale the shift
A card that needs longer than FWT to answer replies with S(WTX) carrying a
multiplier, and ISO 14443-4 has the timeout become FWT * WTXM for that
exchange. iso14443b_apdu() multiplied the shift instead:

    uint32_t fwt_temp = (s_iso14b_fwt * wtxm);
    iso14b_set_timeout((32 << fwt_temp));

(32 << fwi) is the FWT in ETUs - the form iso14b_set_fwt() uses, and the
one the client prints in hf 14b info - so this computed 32 << (fwi * wtxm).
With the fwi of 8 that a passport reports, wtxm 1 happens to come out
right, wtxm 2 is 256 times too long, and wtxm 4 shifts a uint32_t by 32.
That is undefined, and on ARM it leaves 0, so the read that follows gives
up before the card has answered and the client reports

    APDU: no APDU response

Found on a Polish ePassport that would not read. Every short command
answered - SELECT, an unsupported instruction, a malformed MSE - and only
MSE:Set AT with P1P2 C1A4 was silent, which is the one command in the
exchange that starts the PACE ECDH setup and so the only one that ever
asks for more time. Older passports read because they ask for a smaller
multiplier, where the wrong formula still produces a usable number.

Tested on RDV4 against that document: the MSE:Set AT that returned nothing
now answers 9000, and hf emrtd dump completes in 3 seconds with PACE
(ECDH, Generic Mapping, 3DES-CBC-CBC, NIST P-256), every data group read
and every EF_SOD hash matching.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
2026-09-01 11:34:40 -04:00
iceman1001 12a890f444 text 2026-09-01 16:24:46 +02:00
iceman1001 89b1de6526 user supplied keys was not taken in consideration and also it left the field on 2026-09-01 16:17:35 +02:00
YoungJules 6bc39ff78c Fix pm3line fallback for ProxSpace/MinGW builds 2026-09-01 14:20:12 +02:00
Philippe Teuwen 18aed4eaa4 spurious hidden char 2026-09-01 14:09:49 +02:00
Philippe Teuwen 3ed5792b23 fix doc link 2026-09-01 14:07:12 +02:00
iceman1001 81a6f3bf3d style 2026-09-01 13:34:23 +02:00
iceman1001 be88db1b54 move clock 2026-09-01 13:34:02 +02:00
iceman1001 b65017ceaf move clocks 2026-09-01 13:32:49 +02:00
iceman1001 2fc7f81a4a fix PM3_GENERIC builds. dont compile SAM-sim module things 2026-09-01 13:30:04 +02:00
iceman1001 2f8f72b679 text 2026-09-01 13:06:08 +02:00
iceman1001 b2fa9d540e usart: drop the rx ring, read straight from the PDC banks
Saves 1040 bytes of .bss (BigBuf on AT91), removes a second copy of every
byte, and fixes a full/empty ambiguity where filling the ring to exactly
sizeof(us_rxfifo) left low == high, so usart_rxdata_available() returned 0
and the next bank overwrote 1 kB of received data.
2026-09-01 13:01:44 +02:00
iceman1001 f4bfda2b3c fix overzealous check for data_availablitity in 'hf 15/iclass' commands 2026-09-01 12:59:50 +02:00
iceman1001 db7686d988 forgot to empty the trace when clearing bigbuf 2026-09-01 12:55:38 +02:00
iceman1001 96ed916074 recompress fpga streams 2026-09-01 11:34:45 +02:00
iceman1001 83c3f81b1b move to 16kb fpga ring buffer size, recompile fullimage and lower stack size to 7160 bytes 2026-09-01 10:14:35 +02:00
Iceman ea5b017299 Merge pull request #3568 from innocentbystanderproxmark/master
Consolidiating/Cleaning up PM5 First Time Use documentation
2026-09-01 15:08:45 +07:00
Iceman 6c5be68fe7 Merge pull request #3565 from pkilar/epassport-diagnose-failed-reads
Fix ePassport reporting of failed reads, and decode EF_CardAccess
2026-09-01 15:08:15 +07:00
iceman1001 7326003be3 lessen stack usage 2026-09-01 06:41:00 +02:00
iceman1001 453c192a32 lessen stack usage 2026-09-01 06:40:46 +02:00
iceman1001 ef2ffa2bb4 lessen stack usage 2026-09-01 06:40:26 +02:00
iceman1001 70b2262326 lessen stack usage 2026-09-01 06:40:07 +02:00