Commit Graph

6012 Commits

Author SHA1 Message Date
Iceman 490c211361 Merge branch 'master' into bl
Signed-off-by: Iceman <iceman@iuse.se>
2025-05-28 18:10:16 +02:00
Iceman 9287e872f1 Merge pull request #2865 from Arkwin/patch-2
Saflok Parsing
2025-05-28 18:09:13 +02:00
Antiklesys bbd6f51586 Updated hf iclass info for silicon check
Updated hf iclass info to use silicone identification based on CSN rather than hf 14b responsiveness
This reverted https://github.com/RfidResearchGroup/proxmark3/commit/4f85def6b07ad9cefe78d9bd11b18f14fad5dcb7
2025-05-28 23:59:17 +08:00
iceman1001 ada340de94 fix exit call 2025-05-27 14:52:04 +02:00
iceman1001 01e57db5f1 text 2025-05-27 10:12:58 +02:00
iceman1001 585670d55c hf iclass tear - text output and when e-purse get cleared it stops and informs user 2025-05-27 09:44:27 +02:00
Kara Zajac e35a4e292d Used make style
Fixed some code comments and ran make style

Signed-off-by: Kara Zajac <Arkwin.Advanced@gmail.com>
2025-05-26 23:39:25 -04:00
Kara Zajac 176b543069 Saflok Parsing
Added when a Saflok card is detected, it decrypts and parses the data, outputting it to the screen.

Previous security researchers did this work, and I merely adapted it from the Flipper Zero code to the Proxmark3 code.

Their info is below:

// Decryption and parsing from: https://gitee.com/wangshuoyue/unsaflok
// Decryption algorithm and parsing published by Shuoyue Wang
// Parsing also inspired by Lennert Wouters and Ian Carroll's DEFCON 32 talk
// https://defcon.org/html/defcon-32/dc-32-speakers.html
// FZ parser by @Torron, with help from @xtruan, @zacharyweiss, @evilmog and kara (@Arkwin)

Signed-off-by: Kara Zajac <Arkwin.Advanced@gmail.com>
2025-05-26 15:46:23 -04:00
Antiklesys b378a369d1 Updated hf iclass tear to break endless read loop
Updated hf iclass tear to break endless read loop when the card can't be read anymore during the tear operation. Set a 10 attempts limit.
2025-05-26 23:53:33 +08:00
Antiklesys 23928b4041 Updated hf iclass tear
Updated hf iclass tear with the following improvements:

1- Show failed read if ran in verbose mode
2- Improved out logic when tearing block 1
3- Showing fuses comparison table when tearoff affects block 1 fuses
2025-05-26 16:01:06 +08:00
iceman1001 b8e8c41f28 fix the cut of version and git sha-hash 2025-05-25 20:29:15 +02:00
Antiklesys 1349b6d282 Updated tearoff repeat to not go below original start value and show loop count
Updated tearoff repeat to not go below original start value and show loop count
2025-05-25 21:50:17 +08:00
Iceman d5fb619308 Merge pull request #2861 from Antiklesys/master
Updated hf iclass tear to not run if the authentication fuses are blown
2025-05-25 14:44:29 +02:00
iceman1001 eecdad7ac8 text 2025-05-25 14:40:46 +02:00
Antiklesys 8d3e301b55 Updated hf iclass tear to not run if the authentication fuses are blown
Updated hf iclass tear to not run if the authentication fuses are blown.
Or it will just get stuck at the beginning and not start anyway. At least this informs the users why this is happening.
2025-05-25 20:36:35 +08:00
iceman1001 4b92118f1f clear trace log before starting to run hf iclass tear 2025-05-25 11:29:43 +02:00
Antiklesys d402903db5 Fixed authentication read for iclass tear
If the card flips to nonsecure mode during the tearoff of block 1, this read command will be stuck.
So we can disable auth completely when trying to read block 1 as that block doesn't require authentication anyway for reading operations.
2025-05-25 17:10:31 +08:00
iceman1001 4da2a9a496 text 2025-05-25 10:55:11 +02:00
iceman1001 dcec8d6e71 text 2025-05-25 10:50:40 +02:00
iceman1001 74f1936132 convert to our calloc instead since we prefer to know allocated shared memory is empty. Also removed a malloc(1) which is just a waste of bytes just like @NVX said a year ago at DefCon 2025-05-25 09:55:32 +02:00
iceman1001 96c58db8e8 style and making sure within limits not to trigger overflows 2025-05-24 22:50:56 +02:00
iceman1001 607f1bb26c style 2025-05-24 22:49:46 +02:00
iceman1001 bb0445d886 text 2025-05-24 21:45:14 +02:00
iceman1001 36e7736603 text 2025-05-24 21:34:17 +02:00
iceman1001 b6a39768a1 text 2025-05-24 21:30:23 +02:00
iceman1001 00c5af4256 text 2025-05-24 21:14:58 +02:00
James Churchill c312bae516 Add "hf mf bambukeys" command to generate Bambu Lab keys 2025-05-25 00:18:25 +10:00
iceman1001 0d8bb030d1 text 2025-05-24 15:40:13 +02:00
iceman1001 473b5679e2 hf iclass dump - I got tired so now the command defaults to use AA1 key when called without a key or key index 2025-05-24 14:21:36 +02:00
iceman1001 a2f9012e13 text 2025-05-24 12:33:11 +02:00
iceman1001 841828eb48 hf iclass tear - output texts 2025-05-24 11:43:34 +02:00
Antiklesys 45ae30fe88 Updated iclass tear colors
Removed a huge chunk of colorful visual spam for when the tearoff isn't happening
2025-05-24 13:48:52 +08:00
iceman1001 ad50e59738 hf iclass tear - some more granular printing and colors when tearing 2025-05-23 23:47:45 +02:00
iceman1001 d4bc190dd4 renamed the hf iclass trdbl -> hf iclass tear 2025-05-23 17:29:28 +02:00
Antiklesys 335c1444bd updated hf iclass trbl to support unsecure page mode
Added unsecure page mode support
2025-05-23 19:06:25 +08:00
Antiklesys 2119e46701 Merge branch 'master' of https://github.com/Antiklesys/proxmark3 2025-05-23 17:11:09 +08:00
Antiklesys 07bfef1550 Bugfixes on hf iclass trbl
Fixed tearoff trigger staying enabled in case of keyboard interruption
2025-05-23 17:11:07 +08:00
Antiklesys 1ca356531e Merge branch 'master' into master
Signed-off-by: Antiklesys <syselkitna@gmail.com>
2025-05-23 17:04:09 +08:00
Antiklesys fbbfeaa977 Update cmdhficlass.c 2025-05-23 17:00:41 +08:00
iceman1001 c716467a7e fixed output for hf iclass trbl to not have tear off debug message and its more compact now 2025-05-23 10:52:09 +02:00
Antiklesys 047b94fbaa Updated hf iclass trbl to support looping
Implemented a functionality for hf iclass trbl to specify how many times to loop at specific delays.
2025-05-23 16:32:48 +08:00
Antiklesys f9322dfe6c Updated trbl
Fixed a bug preventing tearoff stages from being detected correctly, increased verbosity of read data and granularity of displayed information
2025-05-23 15:55:53 +08:00
iceman1001 84b565bec4 style 2025-05-19 22:31:41 +02:00
Antiklesys 59e4875e6c Updated trbl to support custom increments
Updated iclass tearoff function to support custom delay increments
2025-05-18 20:41:04 +08:00
Antiklesys 67fb546887 Update iclass trbl function
Updated trbl function:
1- Better comparison of read values vs expected values
2- Stop on "partial values tearoff", show tearoff results when the block isn't zero, but is also different from the original block (even tho is not yet with the same values of the expected block)
3- Improvement to verbose mode
2025-05-18 01:54:55 +08:00
Antiklesys 23232f8aa3 iclass tearoff attack fixes
Fixed spacing, time unit, and fixed a bug preventing from properly using the credit key.
2025-05-17 23:19:10 +08:00
Antiklesys 3c35a87dee Fix bug with iclass legbrute index value being ignored
Fixed issue https://github.com/RfidResearchGroup/proxmark3/issues/2845
2025-05-16 23:19:26 +08:00
Jakub Kramarz 2163d78126 cmdhfseos: fix invalid memory access in select_DF_verify
The real default key index in CmdHfSeosGDF passed to select_DF_verify was different than documented, resulting in out of bound read.
2025-05-09 00:05:43 +02:00
Jakub Kramarz 0655b6389e cmdhfseos: fix stack buffer overflow in select_DF_verify
increased CMAC buffer size, otherwise memset in aes_cmac writes 16-bytes to 8-byte buffer
2025-05-08 23:52:01 +02:00
iceman1001 b2983ba025 convertion between size and int might cause type convertion confusing 2025-05-01 08:35:41 +02:00