dandri/proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-09-21 05:15:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,308 Commits 3 Branches 21 Tags
aa2ddcdee3ebfa905d6dbc4204b9c3f60c692cd2
Commit Graph
19308 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Antiklesys aa2ddcdee3 Merge branch 'master' of https://github.com/Antiklesys/proxmark3 2024-10-20 11:24:10 +08:00
Antiklesys 53dfcc2569 Update CHANGELOG.md 2024-10-20 11:23:12 +08:00
Antiklesys 88364f6a48 Update iclass.c 
Signed-off-by: Antiklesys <syselkitna@gmail.com>
 2024-10-20 11:18:50 +08:00
Antiklesys d6f8f9db4a Updated hf iclass legrec arm side and added custom key to dictionary 
Updated hf iclass legrec arm functionality
Added new custom standard key to the repository

Todo: Improve keygen algorithm efficiency
 2024-10-20 11:16:46 +08:00
Philippe Teuwen 41a43bc85c hf mf sim: add option to allow key b to be used even if readable 2024-10-19 20:34:40 +02:00
Philippe Teuwen 838e0adfa7 rework Mifare simulation flags 2024-10-19 20:34:40 +02:00
iceman1001 e1fa9374d0 text and style. Suspect string formatter used "%*.*s" , we normally use "%.*s" 2024-10-19 11:16:22 +02:00
iceman1001 375b1439a1 data num now also properly pad hex converted to binary string operations 02 -> 00000010 -> 11111101 -> 01000000 2024-10-19 06:46:16 +02:00
iceman1001 8c04d9d0c8 data num didnt properly zero pad binary string outputs. It was cutting starting zeros. Those are now handled. Hex output still doesnt handle zero padding 2024-10-19 06:39:43 +02:00
iceman1001 2932fefd82 style define 2024-10-19 06:36:52 +02:00
Philippe Teuwen 5848b31ee1 trace list: don't mix 02x and 02X 2024-10-18 19:44:38 +02:00
Philippe Teuwen e6876f4b73 mfkey32v2 typo 2024-10-18 19:44:38 +02:00
iceman1001 c8fe7205b4 enhanced the hf iclass info command to try legacy aa1 and if found read out and decode 2024-10-18 19:24:02 +02:00
iceman1001 70581e3bfa modified iclass chk to load the default dictionary file. hf iclass chk -> use iclass_default_keys and hf iclass chk --elite -> use iclass_elite_keys`.. a bit simple 2024-10-18 18:20:43 +02:00
iceman1001 0c2ef9d3a8 style 2024-10-18 17:37:52 +02:00
Philippe Teuwen 91004aa2f1 hf mf sim: remove mention of non-existing option 2024-10-18 17:03:54 +02:00
Iceman 37e8812dfb Merge pull request #2579 from douniwan5788/82xx_print 
improve Hitag S output
 2024-10-18 11:49:21 +02:00
douniwan5788 2ac74e01db improve Hitag S output 2024-10-17 21:31:24 +08:00
Iceman 81a8bed9b4 Merge pull request #2578 from douniwan5788/doc 
doc: update 82xx
 2024-10-17 14:22:41 +02:00
douniwan5788 592b0ba75b doc: update 82xx 2024-10-17 19:16:57 +08:00
Iceman 66ae89f3f3 Merge pull request #2577 from Cryolitia-Forks/master 
feat: detect march and mcpu
 2024-10-17 11:56:40 +02:00
Cryolitia PukNgae c95f9ee34f docs: update CHANGELOG 2024-10-17 15:19:09 +08:00
Cryolitia PukNgae 79540b1d33 feat(mfd_aes_brute): detect march and mcpu 
fix build on riscv64
 2024-10-17 15:14:41 +08:00
Philippe Teuwen 079689628b hf mf sim: add nested reader attack (needs data & rf08s nonces) 2024-10-16 19:54:03 +02:00
Iceman 00c84b9c22 Merge pull request #2576 from ANTodorov/fix_em4x50_read 
fix em4x50_read function
 2024-10-16 18:30:40 +02:00
ANTodorov 71b354043e fix em4x50_read function 
affected `lf search` and `lf em 4x50 rdbl -b <blk>`
 2024-10-16 19:10:41 +03:00
Iceman 1a3c5c4981 Merge pull request #2575 from ANTodorov/patch-1 
Update spi_flash_decode.py
 2024-10-16 17:05:41 +02:00
Anton Todorov bdaa6d2852 Update spi_flash_decode.py 
add some more SPI devices

Signed-off-by: Anton Todorov <ANTodorov@users.noreply.github.com>
 2024-10-16 16:36:36 +03:00
Philippe Teuwen 5b7ba3bf50 MFsim: RATS_IN_DATA was not a proper bit flag 2024-10-16 15:24:01 +02:00
iceman1001 bed3dcee29 text 2024-10-16 09:37:51 +02:00
iceman1001 5ac1ae2e06 when in bootrom mode, the arg0 variable needed to be zeroed out before usage. We assign arg0 from a message before but we can discard that information in this particular case. Its quite odd to see the assignment failing but empty it out seems to have fixed it. 2024-10-16 09:36:37 +02:00
iceman1001 e1fc066f55 style 2024-10-16 09:34:14 +02:00
Philippe Teuwen 5470303588 prepare MifareAcquireStaticEncryptedNonces for standalone 2024-10-16 01:48:36 +02:00
Philippe Teuwen 3b91624ea6 Mifare1ksim logic closer to SimulateIso14443aTag and keep running when using mfkey32v2 2024-10-16 01:46:13 +02:00
Philippe Teuwen c1a038aa56 readerAttack: inject only found key 2024-10-16 01:46:13 +02:00
Philippe Teuwen 8828c9513e hf mf sim -x: collect nonces for mfkey32v2 only if current sim key is invalid 2024-10-16 01:46:13 +02:00
Philippe Teuwen 809b6c881a mfkey32_moebius: no need to wait for 20 keys to see there are more than 1 key... 2024-10-16 01:46:13 +02:00
Philippe Teuwen ffd5601325 hf mf sim: simplify nonce collection 2024-10-16 01:46:13 +02:00
Iceman e9445851e3 Merge pull request #2572 from douniwan5788/hitag1comp 
fix: switch Hitag S UID REQUEST to HITAGS_UID_REQ_ADV1 for Hitag 1 co…
 2024-10-15 13:47:28 +02:00
Iceman 1bf6104e79 Merge pull request #2573 from douniwan5788/tracelist 
fix: `trace list` when there are exactly 8 bits of data.
 2024-10-15 13:46:19 +02:00
douniwan5788 ac1f490aab fix: trace list when there are exactly 8 bits of data. 2024-10-15 13:36:34 +08:00
douniwan5788 252d6a29db fix: switch Hitag S UID REQUEST to HITAGS_UID_REQ_ADV1 for Hitag 1 compatibility 2024-10-15 13:35:47 +08:00
Philippe Teuwen bb3d36bf20 hf mf sim: fix text 2024-10-15 01:27:05 +02:00
Philippe Teuwen 02f0b1bcdd Make sure MFC dumps & keys are saved in the dump user pref path 2024-10-14 22:53:00 +02:00
Philippe Teuwen c66834f19c fm11rf08s_recovery: get prefs via JSON 2024-10-14 21:49:41 +02:00
Philippe Teuwen 0961b01950 add option --json to pref show 2024-10-14 21:49:40 +02:00
Philippe Teuwen 4dea606468 saveFileJSONex: reuse saveFileJSONrootEx 2024-10-14 21:48:35 +02:00
Philippe Teuwen e38f8e2d82 split saveFileJSONex 2024-10-14 20:22:55 +02:00
Philippe Teuwen 44c60b45eb Merge pull request #2571 from Eltrick/master 
fm11rf08s_recovery.py: option to keep generated dictionaries after processing; save dump and key to the path shown in `prefs show`
 2024-10-14 19:21:39 +02:00
Philippe Teuwen e6f49aada6 CodeQL complains about Python pip install out of a virtualenv. I don't think CodeQL needs Python. 2024-10-14 19:06:33 +02:00