Commit Graph
12259 Commits
Author SHA1 Message Date
Iceman 92e8dea093 Merge branch 'master' into master
Signed-off-by: Iceman <iceman@iuse.se>
2024-12-07 05:18:41 +01:00
Chris Simon b1a5df53d3 Update mfc_default_keys.dic
Added Dutch Statistics Agency

Signed-off-by: Chris Simon <info@decomputeur.nl>
2024-12-05 10:45:49 +01:00
Iceman 587761fdf0 Merge pull request #2680 from Eltrick/new-keys
Add facility static hotel key
2024-12-05 06:22:30 +01:00
Lucifer Voeltner 5bfd1239ae Add new facility static hotel key 2024-12-05 10:41:26 +07:00
nvx 34b2a3175f fis MF3ICD40 (D40) secure channel crypto 2024-12-04 22:21:22 +10:00
Philippe Teuwen 87266654f7 MIFARE Plus 4b UID: fix signature check 2024-12-04 08:19:17 +01:00
Iceman 8079153ee6 Merge branch 'master' into hf-mf-ultimatecard-script-auto-set-maxblock
Signed-off-by: Iceman <iceman@iuse.se>
2024-12-03 16:26:01 +01:00
Iceman 4cd914ad95 Merge branch 'master' into smart_spi_detect
Signed-off-by: Iceman <iceman@iuse.se>
2024-12-03 16:23:56 +01:00
Iceman 3727f63781 Merge pull request #2677 from ry4000/master
R&Y: Updated DEN MyRide AID in aid_desfire.json
2024-12-03 16:20:10 +01:00
Iceman dca915808c Merge pull request #2676 from Eltrick/g3-apdu-help
modify 'hf mf gen3blk' help to comply with the sak change
2024-12-03 16:19:42 +01:00
Iceman db4844e889 Merge pull request #2675 from Nya0/hts-dump
added "lf hitag hts dump" command
2024-12-03 16:19:10 +01:00
ry4000 2950d78703 R&Y: Updated DEN MyRide AID in aid_desfire.json
- Updated Vendor to its legal name (Masabi Ltd)
- Added a standardised description to identify the AID as being issued by Masabi Ltd for its Justride platform.

Thank you.

-R&Y.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2024-12-03 22:51:29 +11:00
ANTodorov bd803ce8fd rework to use smart SPI flash detection
Check JEDEC ID is in range between 0x0001 ... 0xFFFE,
Compare the output from 0x90 and 0x9F,
Then the size from the JEDEC ID

Otherwise fall-back to 256 kB

Extend the spi_flash_decode.py to handle more (known) SPI flash ICs
2024-12-03 09:40:57 +02:00
Lucifer Voeltner e416080ae8 make the help message even clearer, and fix a bug featuring me being unable to count 2024-12-03 10:23:41 +07:00
Lucifer Voeltner cbc7d61781 modify 'hf mf gen3blk' help to comply with the sak change 2024-12-03 10:13:09 +07:00
Piotr Rzeszut 416770c170 Remove support for 2k MIFARE tags, as it will be better to add this together with other variants of MIFARE Plus in the future 2024-12-02 22:43:05 +01:00
Piotr Rzeszut 7d9d783420 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into hf-mf-ultimatecard-script-auto-set-maxblock
# Conflicts:
#	CHANGELOG.md
2024-12-02 22:41:47 +01:00
Iceman 80970db7e3 Merge pull request #2672 from kitsunehunter/laundry-keys
add static laundry card keys
2024-12-02 20:20:17 +01:00
Iceman 9623a5f302 Merge pull request #2669 from Eltrick/master
'hf mfu incr' to increment counters of UL-EV1 family; Also fix reading of NTAG counters in 'hf mfu info'
2024-12-02 20:18:27 +01:00
Iceman c336cdc931 Merge pull request #2668 from Antiklesys/master
Added unhash instructions after legbrute
2024-12-02 20:14:36 +01:00
nya0 7fbcb1c30f added "lf hitag hts dump" command 2024-12-02 16:15:13 +03:00
Xavier 4e40d3d6a7 Update mfc_default_keys.dic
Signed-off-by: Xavier <90627943+kitsunehunter@users.noreply.github.com>
2024-12-01 20:27:08 -05:00
Xavier ef74de3721 add static laundry card keys
these cards are stored value and manipulating the data is useful

Signed-off-by: Xavier <90627943+kitsunehunter@users.noreply.github.com>
2024-12-01 20:17:05 -05:00
Lucifer Voeltner d8d090612d 'hf mfu incr' to increment counters of UL-EV1 family; Also fix reading of NTAG counters in 'hf mfu info' 2024-12-01 15:29:00 +07:00
Philippe Teuwen ca15bbd019 Rework theremin script 2024-11-30 22:49:31 +01:00
Antiklesys e4a3a244ce Added unhash instructions after legbrute
Added unhash instructions after legbrute
2024-11-30 07:53:52 +08:00
Piotr Rzeszut a11f3173cc Add preset for 2k MIFARE Classic tags hf_mf_ultimatecard.lua when using preset configurations, update changelog 2024-11-29 01:45:58 +01:00
Piotr Rzeszut a3eb3bfbe9 Automatically set maximum read/write block by hf_mf_ultimatecard.lua when using preset configurations 2024-11-29 01:43:56 +01:00
Philippe Teuwen 23e6aa40b7 hf/lf tune: fix segfault when called from script 2024-11-28 17:35:45 +01:00
Iceman 80f40492fc Merge branch 'master' into hf-mf-ultimatecard-script-max-rw-blocks
Signed-off-by: Iceman <iceman@iuse.se>
2024-11-28 15:20:56 +01:00
Iceman e1e5bfd82c Merge pull request #2662 from ry4000/master
R&Y: Added GRB Tap-N-Go to aid_desfire.json
2024-11-28 15:18:46 +01:00
Piotr Rzeszut be21154d83 Refactor arguments help of hf_mf_ultimatecard.lua, done because already had to split the string due to reaching limit of string length in lua. 2024-11-28 01:04:18 +01:00
Piotr Rzeszut bf1726a31d Add option to set maximum read/write block using hf_mf_ultimatecard.lua 2024-11-28 01:02:41 +01:00
Piotr Rzeszut 0fa8351fa9 Add display of maximum read/write block in configuration parsing in hf_mf_ultimatecard.lua 2024-11-28 01:01:11 +01:00
douniwan5788 f0b93405fa fix Hitag S concatbits and lf em 410x clone --hts 2024-11-27 00:02:00 +08:00
ry4000 10d8ae13ca R&Y: Added GRB Tap-N-Go to aid_desfire.json
- Added GRB Tap-N-Go F21201 and F21202 to aid_desfire.json.
Thank you.
-R&Y.

Signed-off-by: ry4000 <154689120+ry4000@users.noreply.github.com>
2024-11-26 18:08:48 +11:00
Philippe Teuwen 830549b474 hf mf isen: add collect_fm11rf08s_without_backdoor option 2024-11-25 00:53:57 +01:00
Philippe Teuwen c4b8569d87 fix CmdHF14AMfISEN error handling 2024-11-24 12:26:07 +01:00
Iceman cdfa834c48 Merge pull request #2656 from hochwasser/patch-1
Update mfc_default_keys.dic
2024-11-24 08:01:10 +01:00
Iceman f6a15fbf27 Merge pull request #2658 from Akury83/master
Update t55xx_default_pwds.dic
2024-11-24 07:58:21 +01:00
Antiklesys 2aae3317a0 Added more configcards
Added special config cards:

1- Elite Bugger : bugs the reader causing an erroneous and disruptive behavior
2- Added one config card to change the reader's default master key
3- Added a reset master key config card to restore the reader to the default master key
2024-11-24 13:08:28 +08:00
Antiklesys 2f2667944c Update cmdhficlass.c 2024-11-24 12:59:04 +08:00
Akury83 8ae5e7aee1 Update t55xx_default_pwds.dic
Update to include Chinese cloner ZX-COPY10.
Sniffed using the pm3 client: ```[usb] pm3 --> lf t5 sniff -1

[=] T55xx command detection
[+] Downlink mode           |  password  |   Data   | blk | page |  0  |  1  | raw
[+] ------------------------+------------+----------+-----+------+-----+-----+-------------------------------------------------------------------------------
[+] Default Read            |            |          |  3  |   0  |  18 |  47 | 101011
[+] Default write/pwd read  | [00083838] | 00107070 |  0  |   0  |  18 |  46 | 10000000000000100000111000001110000000
[+] Leading 0 pwd write     |   00000000 | 00000000 |  0  |   0  |   6 |  70 | 0100000000000000000000000000000000000000000000000000000000000000000000000
[+] Default write/pwd read  | [0EAAACAA] | 1D555955 |  1  |   0  |  18 |  46 | 10000011101010101010101100101010101001
[+] Default write/pwd read  | [2AB2CB4D] | 5565969A |  2  |   0  |  18 |  46 | 10001010101011001011001011010011010010
[+] Leading 0 pwd write     |   00000000 | 00000000 |  0  |   0  |   7 |  16 | 0100000000000000000000000000000000000000000000000000000000000000000000000
[+] Default write/pwd read  | [4B352AB2] | 966A5565 |  3  |   0  |  18 |  47 | 10010010110011010100101010101100101011
[+] Leading 0 pwd write     |   00000000 | 00000000 |  0  |   0  |   8 |  23 | 0100000000000000000000000000000000000000000000000000000000000000000000000
[+] Default write/pwd read  | [3D9EAE24] | 7B3D5C48 |  7  |   0  |  18 |  46 | 10001111011001111010101110001001000111
[+] -----------------------------------------------------------------------------------------------------------------------------------------------------

[usb] pm3 --> lf t5 det -p 7b3d5c48
[=]  Chip type......... T55x7
[=]  Modulation........ FSK2a
[=]  Bit rate.......... 4 - RF/50
[=]  Inverted.......... Yes
[=]  Offset............ 33
[=]  Seq. terminator... No
[=]  Block0............ 00107070 (auto detect)
[=]  Downlink mode..... default/fixed bit length
[=]  Password set...... Yes
[=]  Password.......... 7B3D5C48

[usb] pm3 -->```

Signed-off-by: Akury83 <87064827+Akury83@users.noreply.github.com>
2024-11-24 15:45:43 +11:00
hochwasser c3e9602690 Update mfc_default_keys.dic
Keys of the BW Kantine

Signed-off-by: hochwasser <hochwasser@users.noreply.github.com>
2024-11-23 10:26:24 +01:00
Ondřej Nový 3451374cf7 Add new Mifare Classic keys from Momentum firmware project. 2024-11-22 21:27:35 +01:00
Iceman f1ff643aca Merge pull request #2654 from Antiklesys/master
Updated legrec functionality to support simulations
2024-11-22 13:26:27 +01:00
Iceman c3571f1035 Merge pull request #2648 from csBlueChip/master
add KDF functionality to rf08s 'full' card recovery script
2024-11-22 13:24:13 +01:00
Iceman adb5d5eea5 Merge branch 'master' into master
Signed-off-by: Iceman <iceman@iuse.se>
2024-11-22 13:10:16 +01:00
iceman1001 daff8228a2 Revert "Release v4.19552 - Orca"
This reverts commit a039ac18cc.
2024-11-22 12:15:19 +01:00
iceman1001 a039ac18cc Release v4.19552 - Orca 2024-11-22 12:15:19 +01:00