Commit Graph
57 Commits
Author SHA1 Message Date
Tiernan e2636a6acf Update description of some MFC keys
Updated comment to reflect lock brand and model.

Signed-off-by: Tiernan <neovortex@gmail.com>
2026-04-27 18:12:57 +10:00
nvx 812c58f601 cardhopper fixes
make usart write buffer const
sub out magic numbers with defines
fix edge case handling 255/256 byte frames (including crc)
add sanity checks to avoid buffer overrun on some "should never happen" edge cases
don't wait for rats reply from card before listening to next reader frame
cap fsci to 8 (256 bytes) as that's the most the proxmark3 codebase currently handles
eliminate 1k of ram usage by tweaking how emulation responses are sent
2025-04-21 23:17:47 +10:00
nvx 29e0c51393 Changed hf mf info - now differentiates between full USCUID and cut down ZUID chips 2025-01-14 22:36:59 +10:00
nvx 97953d1ef3 fix hf mf csetuid --gdm 2025-01-14 22:00:17 +10:00
nvx 34b2a3175f fis MF3ICD40 (D40) secure channel crypto 2024-12-04 22:21:22 +10:00
nvx 96a1f21764 fix pacs data in example trace filename 2024-12-02 16:16:59 +10:00
nvx bac1bf05af log a message when aborting trace list display 2024-11-13 21:53:31 +10:00
nvx 5c195b8a14 fix ssp_clk sometimes resetting to 0 shortly after being started or reset
this could happen if TC2 was already 0 when it was started or reset
resulting in the initial reset not happening until TC0 had overflowed for
the first time as the delay to ensure this didn't happen would be missed
when TC2 was already 0

the new behaviour results in TIOA0 being toggled when a software trigger
of TC0 happens which makes TC2 reset immediately without having to wait
for TC0 to overflow
2024-11-04 22:04:05 +10:00
nvx 690864e970 clear the prompt using ANSI "clear entire line" escape
this replaces the old behaviour of using a fixed length of spaces
which can sometimes fail to clear the entire line if it's too long
2024-11-03 10:57:11 +10:00
nvx ef0cf93a5d fix typos and regenerate command list 2024-11-02 23:34:38 +10:00
nvx 1157ef0b38 update changelog 2024-11-02 22:24:45 +10:00
nvx 6d7fcc642a add gdm flag to hf mf c* commands
this enables the use of hf mf c* commands with gdm/uscuid cards when the alt wake up mode 20(7)/23 is enabled rather than gen1 wake up
2024-11-02 22:22:13 +10:00
nvx df5e2ce05b improve cardhopper to improve reliability when parts of the packet are buffered 2024-11-02 19:53:23 +10:00
nvx 2432b4282a Fix staticnested_0nt on mingw/proxspace
Fixes keyCount_mutex[0] and keyCounts[0] not being properly initialised
Fixes progress reporting not properly clearing the line
Switch malloc(a*b) style calls to calloc(a, b)
2024-08-02 22:13:04 +10:00
nvx e22776a7e0 style 2024-01-26 20:20:25 +10:00
nvx 49f7ae57dc Changed hf mf gdmcfg/gdmsetcfg commands to support Gen1a and GDM Alt magic wakeups
This was implemented with a new pair of RPCs CMD_HF_MIFARE_READBL_EX and CMD_HF_MIFARE_WRITEBL_EX
these RPCs support all combinations of read/write commands, wakeup, and auth options so
in time can replace the other MFC read/write commands too reduce armsrc code size
and complexity.

Also added config parsing for the gdm cfg block when reading with hf mf gdmcfg and
explicitly with hf mf gdmparsecfg.
2024-01-26 20:09:08 +10:00
nvx b4ae4c429f Fix some low hanging differences when running make style on Windows vs Linux 2024-01-26 20:08:36 +10:00
nvx da564aed3c Fix hf sniff
This was broken in commit 17ab86c52 as the forced rounding up of
the size to 4-byte alignment in BigBuf_malloc made the size check
possibly larger than the buffer size as the check was always +3 on
the requested size rather than the rounded size. This was made
worse by BigBuf_max_traceLen not taking into account alignment
either and the alignmentn check in hfsnoop.c checking to 2 byte
alignment instead of 4 byte alignment.

The alignment size check now checks the size after alignment
rounding, and BigBuf_max_traceLen takes into account alignment
losses too reducing the need for BigBuf consumers to have to care
about alignment.
2024-01-24 00:10:05 +10:00
nvx d2d6f80d11 Fix some missing frees, null dereferences and missing initialisation picked up by clang-analyzer 2024-01-16 00:22:53 +10:00
nvx 1828358ab0 Multiple hf_cardhopper improvements
Allow button presses to break
Handle non-zero CID from reader by relaying RATS to the card and improving PPS and WTX handling
More reliably cook ATS values
Ignore packets that look like they're coming from the client (NG packets)
2024-01-15 22:05:30 +10:00
nvx d156e48a83 hf 14a apdu now uses the FWI and SGFI values from the ATS to determine an appropriate timeout.
This fixes issues when using the command against cards that indicate really slow times, such as card emulation by hf_cardhopper.
2024-01-01 21:14:32 +10:00
nvx 8f577ad963 Improved magic detection
Magic detection no longer stops when a single type is found as cards may support multiple types of magic, so all detected types will be reported now.
GDM/USCUID chips are now detected when GDM magic auth is disabled but magic WUP (40 or 20) is enabled.
Gen2/CUID/DirectWrite is now detected when default keys and ACLs are used by attempting to write to block 0 but aborting before actually completing the write.
2023-12-30 19:53:23 +10:00
nvx 33eaaa535f Changed hf_cardhopper standalone mode to allow running over the internal Proxmark3 USB-CDC serial port.
This functionality can be enabled by adding the following to your Makefile.platform:
STANDALONE_PLATFORM_DEFS+=-DCARDHOPPER_USB
2023-12-29 22:06:57 +10:00
nvx d3a90a5da3 Clear bss on bootloader start.
This fixes a bug with the USB device serial number sometimes not working in bootloader mode.
2023-12-14 20:33:00 +10:00
nvx 33ec6f43fc Update changelog 2023-11-26 19:17:57 +10:00
nvx 7b0ca43695 Fix iClass dump truncating the AA2 area and improve dump reliability by fixing cmd retry delays. 2023-11-26 19:04:54 +10:00
nvx c1c512f325 Changed hf iclass view/decrypt to detect SIO lengths better and show if legacy credentials are encrypted 2023-10-04 18:40:58 +10:00
nvx 186308cb4a Add hf iclass creditepurse command to allow crediting the epurse debit value. 2023-09-10 23:00:23 +10:00
nvx 8dd963d305 make style 2023-08-24 16:34:33 +10:00
nvx 42330fc5ed Misc tidyups replacing magic numbers with defines,
better help text, and some added comments
2023-08-24 15:08:11 +10:00
nvx a2a3142355 Improve iClass SIO and legacy credential detection to improve
reliability. Now relies on the legacy config block for SR detection
and the end-of-SIO detection no longer partially cuts off the SIO
for any dumps I have.
2023-08-23 09:27:05 +10:00
nvx 9fdf314347 regenerate doc/commands.json 2023-08-23 03:15:21 +10:00
nvx bc87615008 Fix help text for hf iclass esetblk 2023-08-23 02:45:05 +10:00
nvx d183944bb1 Add CHANGELOG entry for hf iclass esetblk command 2023-08-22 07:53:57 +10:00
nvx 210d2847ae Adds hf iclass esetblk, equivalent to hf mf esetblk
Also some minor tweaks to make commands.json and commands.md
properly on Windows.
2023-08-22 07:45:05 +10:00
nvx c3c08e07e4 Fix hf mf gdmsetlbk block data being accidentally prefixed with a 0x00.
This fixes a regression caused by edd8e36 (PR #2021).

gdm auth has no concept of A or B keys, a partial cleanup in the
previous PR removed the key type from the arm code, but the
corresponding removal was missed in the client side resulting in
mismatched structs for cmd CMD_HF_MIFARE_G4_GDM_WRBL.
2023-07-26 18:53:31 +10:00
nvx a9c0fd0b1c Fix regression caused by edd8e36 (PR #2021).
Mifare Classic KeyA/B were accidentally switched in some contexts.
2023-07-12 23:04:29 +10:00
nvx edd8e36d80 Cleanup arm-side reader-mode mifare classic block read/write code. 2023-07-04 00:11:01 +10:00
nvx 6d48b1a5dd Update changelog 2023-06-15 22:23:46 +10:00
nvx 5c9c360977 Fix hf iclass/15693 sniff trace timings.
Previously reader durations would be reported to be twice as long
in the trace vs reality, and as a result the start time would be
earlier than it should have been as well.
Also fixes a minor sniff trace timing with card dual subcarrier
responses.
2023-06-15 22:19:02 +10:00
nvx e6ecc5320f Update armsrc and bootrom Makefiles with a .FORCE PHONY target for version_pm3.c
This fixes issues in ProxSpace where the firmware .elf files are sometimes not rebuilt
2023-01-09 00:57:28 +10:00
nvx 4180635218 Add --shallow option to hf iclass reader commands to do shallow (ASK) reader modulation instead of OOK. 2023-01-04 23:59:03 +10:00
nvx e44f847474 Improved NXP SLI/SLIX series tag identification 2022-12-29 22:37:50 +10:00
nvx 4962752472 Fix trace list -r (relative times) not working unless the -u (microseconds) flag was also provided.
Also makes the `--frame` option respect microseconds and relative times as well.
2022-12-02 20:13:13 +10:00
nvx d11999a811 Fix eload from json files failing (ie, hf mf eload -f file.json) when the dump is the full size.
Also fixed an accidental client double free when loading dumps.
2022-08-05 18:38:51 +10:00
nvx bf5f6750f4 Fix gallagher KDF generation for Admin Cards aka Reader Config Cards 2022-08-04 17:05:59 +10:00
nvx 0177d2185f Added more details to the annotations of hf mfdes list output 2022-07-23 22:26:25 +10:00
Tiernan 925589a214 Merge branch 'master' into feature/iclass_dump_view_suppress_repeated_blocks 2022-07-23 12:39:14 +10:00
nvx 728e6d27c7 add preference for dense output option and -z cmd flag 2022-07-23 12:37:07 +10:00
Tiernan 1b8fdfd5f5 Merge branch 'master' into feature/iclass_list_keys_on_check 2022-07-22 17:13:11 +10:00
nvx 30cc57d3aa Fix some bugs in the iClass SIO detection and printing 2022-07-22 14:06:47 +10:00
nvx 1acecc29b1 Changed hf iclass view to suppress consecutive blocks with repeated contents 2022-07-22 14:01:13 +10:00
nvx eb6b170e51 Changed hf iclass list to display matched keys on the CHECK command rather than the card response, and made it check for elite keys too 2022-07-22 13:58:04 +10:00
nvx 5c5a53963a Fixed incorrect card config bit being checked for iClass key access flag 2022-07-22 13:52:09 +10:00
nvx 503ca0641c Add changelog entry 2022-07-20 18:14:00 +10:00
nvx c36395f2cc Add hf gallagher decode command 2022-07-20 17:49:54 +10:00
nvx e2fe92ee3d Fix gallagher desfire kdf for default application card master key 2022-07-20 17:49:51 +10:00