Commit graph

19432 commits

Author SHA1 Message Date
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
Iceman
55ef252a5d
Merge pull request #2539 from Sanduuz/master
Fixed typo in standard name
2024-09-25 12:09:34 +03:00
Iceman
c855994a45
Merge pull request #2540 from jakkpotts/fix-hf_young-simulate
Fixed argument count for SimulateIso14443aTag() in hf_young.c
2024-09-25 12:08:48 +03:00
jakkpotts
886db6978b Add entry to CHANGELOG.md for SimulateIso14443aTag in hf_young.c fix 2024-09-25 01:38:09 -07:00
jakkpotts
e32ab8d1d0 Fix incorrect number of arguments for SimulateIso14443aTag() in hf_young.c 2024-09-25 01:28:39 -07:00
Sanduuz
4979bb2043 Fixed typo in standard name 2024-09-25 10:42:53 +03:00
Iceman
14dcc9dab8
Merge pull request #2536 from douniwan5788/resp_init
refactor: cleanup PacketResponseNG init
2024-09-24 16:16:08 +03:00
douniwan5788
ef0bae7bc6 refactor: cleanup PacketResponseNG init 2024-09-24 21:06:42 +08:00
Iceman
9129cd6442
Merge pull request #2538 from sillygir1/sniffing-fix
Fix hf 14a sniff ignoring reader commands
2024-09-24 12:36:39 +03:00
Iceman
abd671bb3b
Merge pull request #2535 from douniwan5788/hitags_tearoff
add: Hitag S tearoff support
2024-09-24 11:53:49 +03:00
sillygir1
78150d8191 fix: hf 14a sniff ignoring reader commands 2024-09-24 06:05:13 +04:00
douniwan5788
96d462acee add: split PacketResponseNG status to status and reason 2024-09-24 03:10:53 +08:00
douniwan5788
142f2e6075 add: Hitag S tearoff support 2024-09-23 18:48:41 +08:00
Iceman
350ed787e1
Merge pull request #2534 from evildaemond/master
Adding hf 14a simaid
2024-09-23 12:04:00 +03:00
Iceman
425c44ff5b
Merge pull request #2533 from ry4000/master
R&Y: Added UMO and MONECARTE AIDs to aid_desfire.json
2024-09-23 12:01:52 +03:00
Iceman
4f0e062f21
Merge pull request #2532 from douniwan5788/hitag_common
refactor: process Hitag S common args
2024-09-23 12:01:31 +03:00
Adam Jon Foster
03fcc1d8d6
Update pm3_cmd.h
Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2024-09-23 15:31:46 +08:00
Adam Jon Foster
f42e2f76b9
Update CHANGELOG.md
Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2024-09-23 15:07:52 +08:00
Adam Jon Foster
03b291e173
Update CHANGELOG.md
Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2024-09-23 15:07:35 +08:00
Adam Jon Foster
953bfdb4f9
Update iso14443a.c
Fixed Names

Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2024-09-23 15:03:32 +08:00
Adam Jon Foster
b7aadc6d66
Update iso14443a.h
Added custom RATS via iRATS to regular iso14443a tag emulation

Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2024-09-23 14:54:11 +08:00
Adam Jon Foster
089da16ffa
Update iso14443a.c
Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2024-09-23 14:53:34 +08:00
Adam Jon Foster
fd678ae1c7
Update appmain.c
Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2024-09-23 14:49:25 +08:00
Adam Jon Foster
56324b16b2
Update iso14443a.h
Added custom RATS option

Signed-off-by: Adam Jon Foster <me@evildaemond.com>
2024-09-23 14:46:52 +08:00