dandri/proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-13 18:43:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,205 Commits 3 Branches 20 Tags
5f580e34caaeb161deb0404dc24efb3d310cecef
Commit Graph

19205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001 5f580e34ca better filehandling and memory handling in "lf em 410x brute" 2024-10-04 10:41:15 +02:00
Iceman b2e4daf360 Merge pull request #2537 from douniwan5788/reason 
add: split PacketResponseNG status into status and reason
 2024-10-04 11:13:00 +03:00
Iceman e431d33fd5 Merge branch 'master' into reason 
Signed-off-by: Iceman <iceman@iuse.se>
 2024-10-04 11:12:49 +03:00
iceman1001 88a46a289e Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2024-10-04 10:01:56 +02:00
iceman1001 ff765f569f change out some non-breaking wait for response from some command which shouldnt have it. Sniff / simulate / bruteforce should have it. and some minor text / style 2024-10-04 10:01:50 +02:00
Iceman b124d11c09 Merge pull request #2554 from Antiklesys/master 
Fixed config cards segmentation fault
 2024-10-04 10:51:26 +03:00
iceman1001 4584c92fc4 added more waiting time for 14a apdu commands 2024-10-04 09:21:17 +02:00
iceman1001 27f5941395 add waiting time out for hf mfp info 2024-10-04 09:18:39 +02:00
iceman1001 f36e7a59a1 wait a bit longer when selecting a MFU tag 2024-10-04 09:16:04 +02:00
Antiklesys dfa5d0c341 Fixed config cards segmentation fault 
Fixed segmentation fault error from commit 6264b1df9a when trying to generate config cards.
 2024-10-04 12:14:23 +08:00
Philippe Teuwen ffc185cc9e Should fix clang-19 warning 2024-10-03 19:34:52 +02:00
Iceman 000dd4de38 Merge pull request #2552 from ANTodorov/spi_flash_decode 
add a helper script to decode SPI flash JEDEC data
 2024-10-02 20:42:46 +03:00
ANTodorov f0862c9ee2 add a helper script to decode SPI flash JEDEC data 
Signed-off-by: ANTodorov <ANTodorov@users.noreply.github.com>
 2024-10-02 19:33:27 +03:00
Iceman c083d319ec Merge pull request #2551 from ANTodorov/show_JEDEC_data 
show SPI flash JEDEC data
 2024-10-02 14:24:05 +03:00
ANTodorov 7ffab48e77 show SPI flash JEDEC data 
Signed-off-by: ANTodorov <ANTodorov@users.noreply.github.com>
 2024-10-02 14:11:34 +03:00
Iceman 57ae16756d Merge pull request #2550 from Antiklesys/master 
hf iclass unhash improvements
 2024-10-01 20:53:24 +03:00
Antiklesys 992dfdad48 hf iclass unhash improvements 
Added more detailed instructions for next steps after unhashing
 2024-10-02 00:16:03 +08:00
Iceman cf6d5e5d7b Merge pull request #2549 from Antiklesys/master 
unhash hints for next steps
 2024-10-01 18:44:08 +03:00
Antiklesys 190a88c61f Update cmdhficlass.c 
Signed-off-by: Antiklesys <syselkitna@gmail.com>
 2024-10-01 23:33:35 +08:00
Antiklesys 091b76b163 unhash hints for next steps 
Added hints for next steps
 2024-10-01 23:32:00 +08:00
iceman1001 5c5bfe59d6 style 2024-10-01 13:53:33 +02:00
Philippe Teuwen 06d63a8c0e Unify Py/Lua versions in hw version 2024-10-01 13:46:31 +02:00
Iceman 37c0c3aa9d Merge pull request #2548 from merlokk/cipurse_read_fix 
cipurse file read and update fix
 2024-10-01 14:06:14 +03:00
Oleg Moiseenko 6b1d034701 cipurse file read fix 2024-10-01 13:55:54 +03:00
iceman1001 e162cc3953 style and text. Might need some hint for the next step when/how unhash output is used 2024-10-01 10:15:44 +02:00
iceman1001 f4d2d2e5db simplify logic and continue to check use_elite even in default mode key 2024-10-01 09:57:38 +02:00
iceman1001 01a191f385 style 2024-10-01 09:52:46 +02:00
Iceman daa2fe1646 Merge pull request #2546 from jmichelp/patch-3 
Fix missing line return when viewing dumps
 2024-10-01 10:44:21 +03:00
Iceman ce89cdaaa4 Merge pull request #2545 from Antiklesys/master 
Updated iclass config card generation
 2024-10-01 10:43:32 +03:00
Jean-Michel Picod eb0d92ea98 Fix deleted line return 
For some reason, `isprint()` claims that `0xff` is printable. But it's used by print functions as a magic value to suppress the line return.
So when viewing a dump where the last byte of a block/sector is `0xff`, it was suppressing the new line between blocks/sectors.

Signed-off-by: Jean-Michel Picod <jmichel.p@gmail.com>
 2024-10-01 08:29:27 +02:00
Antiklesys 01f5d12259 Update CHANGELOG.md 2024-10-01 11:35:57 +08:00
Antiklesys 6264b1df9a Updated iclass config card generation 
Improved config card generation to support using a different key than the default k0 for the card's key
 2024-10-01 11:35:17 +08:00
Iceman a03cde3db5 Merge branch 'master' into reason 
Signed-off-by: Iceman <iceman@iuse.se>
 2024-09-30 19:00:22 +03:00
iceman1001 50bdec092d fix #2541 som more keys which will need to be verified one of these days. Thanks @TestowyTest456! 2024-09-30 17:58:17 +02:00
Iceman 549388ed92 Merge pull request #2544 from ANTodorov/patch-1 
fix hf mfu pwdgen for 7 byte uid
 2024-09-30 18:53:22 +03:00
Anton Todorov 26fe583a80 hf mfu pwdgen with 4byte uid should adapt to 7 byte 
Signed-off-by: Anton Todorov <ANTodorov@users.noreply.github.com>
 2024-09-30 16:56:14 +03:00
Anton Todorov 047039aed7 Update CHANGELOG.md 
add line for the `hf mfu pwdgen` fix

Signed-off-by: Anton Todorov <ANTodorov@users.noreply.github.com>
 2024-09-30 16:30:57 +03:00
Anton Todorov 0733754968 fix hf mfu pwdgen for 7 byte uid 
The last 3 bytes of the 7 byte uid are zeroed out
Tested with the example from the forum http://www.proxmark.org/forum/viewtopic.php?pid=44238#p44238

Signed-off-by: Anton Todorov <ANTodorov@users.noreply.github.com>
 2024-09-30 16:25:00 +03:00
iceman1001 71c86f4b21 style 2024-09-30 10:36:29 +02:00
Iceman c3591b9692 Merge pull request #2543 from Antiklesys/master 
Completed hf iclass unhash pre-image generation
 2024-09-30 11:32:54 +03:00
Antiklesys f5d8ba3225 Update ikeys.c 
Fixed comments and removed commented lines

Signed-off-by: Antiklesys <syselkitna@gmail.com>
 2024-09-30 15:08:58 +08:00
Antiklesys 946ae5d3d6 Update ikeys.c 
Removed commented lines
 2024-09-30 11:39:53 +08:00
Antiklesys 0ae7e2cd68 Completed hf iclass unhash pre-image generation 
Finished the pre-image generation algorithm to take in account edge scenarios based on special values of z0..z7 that return the same modulo values even tho they have different original values.
This allows the generation of more than 8 pre-images when reversing hash0, showing the full set of valid pre-images per each diversified key.
 2024-09-30 11:24:32 +08:00
Iceman ce1f17634d Merge pull request #2542 from Antiklesys/master 
Added hf iclass unhash
 2024-09-29 20:38:45 +03:00
Antiklesys d5469d567f Added hf iclass unhash 
Added hf iclass unhash based on the document "Exposing iClass Key Diversification"
The command works but only handles the "main" scenarios, retrieving only 8/512 potential hash0 pre-images.
Handling of the additional pre-images is still work in progress.
 2024-09-29 21:38:20 +08:00
Philippe Teuwen 7be8ee0c69 hf 14a raw --crypto1 special auth command now returns auth result as 0x0A/0x04 2024-09-27 11:03:27 +02:00
Philippe Teuwen 2eac5419f0 Add crypto1 support to hf 14a raw 2024-09-26 23:47:09 +02:00
Philippe Teuwen 9a6f6132bc doc 2024-09-26 23:39:53 +02:00
Iceman 2dc0946dc5 Merge pull request #2522 from douniwan5788/logtrace 
fix: Hitag S logtrace time
 2024-09-25 22:37:07 +03:00
douniwan5788 35c8dfc4e0 fix: Hitag S logtrace time 2024-09-26 01:39:04 +08:00