Commit graph

5374 commits

Author SHA1 Message Date
iceman1001 97ef641fad coverity fix, format specifier 2020-04-06 07:29:39 +02:00
iceman1001 b8bbc1d0a5 filename checks 2020-04-06 07:29:12 +02:00
iceman1001 97f06ddcfb coverity fixes 2020-04-06 07:15:34 +02:00
iceman1001 e1c64d3eef text 2020-04-06 06:56:23 +02:00
iceman1001 a32f1520db chg: hf legic eload/esave - always available 2020-04-06 06:55:51 +02:00
iceman1001 961eb193d1 text 2020-04-06 06:55:12 +02:00
iceman1001 227900efee eload/esave skeleton for cryptorf 2020-04-06 06:54:53 +02:00
iceman1001 5e9e6a9ad8 prepp hookup for cryptorf cmds 2020-04-06 06:17:05 +02:00
iceman1001 e0ff7d0338 cryptorf skeleton cmds -WIP- 2020-04-06 06:16:32 +02:00
iceman1001 4df7c3bf03 coverity fixes 2020-04-06 06:05:02 +02:00
Bjoern Kerler ca51fee02e Add ST uid infos 2020-04-06 00:00:53 +02:00
Bjoern Kerler e4187ef8a1
Merge pull request #5 from RfidResearchGroup/master
Update
2020-04-05 21:36:44 +02:00
Bjoern Kerler 25bcd6b89c Improve 14444-3a card detection 2020-04-05 21:33:41 +02:00
iceman1001 aa642d5d1e ax 2020-04-05 18:27:54 +02:00
iceman1001 0029f6fceb minor fixes. wrong params, helptext 2020-04-05 17:02:41 +02:00
iceman1001 0263273ec3 fix: wrong paramname 2020-04-05 17:00:16 +02:00
iceman1001 214bb46e9c fix: hf mfu ndef - ul ev1 48 bytes with a NDEF otp. e1101200, max size mismatch. Now it will select smallest 2020-04-05 16:59:14 +02:00
iceman1001 3a2723ac63 style 2020-04-05 14:53:32 +02:00
iceman1001 acfe18e7e9 rename to lower 2020-04-05 14:18:07 +02:00
Iceman 7e585eab6c
Merge pull request #647 from uhei/legic-clone
Legic_clone.lua: Refactor to work with current command set
2020-04-05 14:14:41 +02:00
Uli Heilmeier eac19be414 Legic_clone.lua: Adopt last command changes 2020-04-05 13:16:14 +02:00
Uli Heilmeier 16b14aa0e6 Legic_clone.lua: Refactor to work with current command set
Refactored to work with current command set and MIM256 and MIM1024 tags
2020-04-05 13:07:30 +02:00
iceman1001 175a5718b0 colors 2020-04-05 12:56:35 +02:00
iceman1001 2474385ab0 colors 2020-04-05 12:49:25 +02:00
iceman1001 95bc1230d7 colors 2020-04-05 12:41:38 +02:00
mwalker33 8fea6cddf7 Concept 2020-04-05 20:36:39 +10:00
iceman1001 2010f8db03 colors 2020-04-05 12:28:49 +02:00
iceman1001 3464dc2ebe helptext colors 2020-04-05 10:05:14 +02:00
iceman1001 7d9c0ebc91 text 2020-04-05 08:52:53 +02:00
iceman1001 33f94612eb color 2020-04-05 08:50:31 +02:00
iceman1001 79515b40b9 color 2020-04-05 08:50:16 +02:00
iceman1001 f13308783f textual @ikarus 2020-04-05 07:58:00 +02:00
Bjoern Kerler 99838b958e Minor fixes, styles adaption 2020-04-05 00:07:05 +02:00
Bjoern Kerler ee60aece68 Improve logging, fix key labels 2020-04-04 18:23:51 +02:00
iceman1001 00bd76e99d text, colors 2020-04-04 12:39:22 +02:00
iceman1001 34adf411c3 layout, text, colors - mfu info, 15 info 2020-04-04 12:17:55 +02:00
ikarus cf44a44575 fix: legic deobfuscate length. 2020-04-04 12:05:26 +02:00
iceman1001 4e3976bab1 textual 2020-04-04 07:22:03 +02:00
iceman1001 945bbe6311 fix: using the right sized param, helps.. 2020-04-04 07:03:30 +02:00
iceman1001 a4ce672d12 cmds list rearrange 2020-04-03 21:34:30 +02:00
iceman1001 260ae4ac19 chg: hf legic rdbl - short params now used. hf legic rdbl o 0 l 16 2020-04-03 21:30:11 +02:00
iceman1001 45223ee5d5 added obsfuscation optionally for dump/restore/eload/esave, consider it wip. As of byte 22. 2020-04-03 20:51:01 +02:00
iceman1001 e0d27d0ea3 remake of HF LEGIC commands input parameters, filename templates and renaming of commands in order to be unified across the client\nhf legic wrbl\nhf legic rdbl\nhf legic esave\nhf legic eload\n WIP, 2020-04-03 19:51:31 +02:00
iceman1001 1ac4c54d93 chg: 'hf legic dump' - now save BIN/EML/JSON, and uses new filename template. filename parameter is changed from O to F, to follow better client\n hf legic dump\n hf legic dump f mydump 2020-04-03 17:59:54 +02:00
iceman1001 24f2f1d341 Chg: 'hf topas reader' got split up into two, 'hf topaz info' which prints detailed information, and reader just prints UID. Now also prints NDEF 2020-04-03 17:39:10 +02:00
iceman1001 c819121d2b Chg: hf search - now continues to search, in case of dual tech cards. Thanks to @ikarus23 2020-04-03 17:37:46 +02:00
iceman1001 dfb3755db5 removed some test code 2020-04-03 14:07:32 +02:00
iceman1001 731e711e34 updated helptexts 2020-04-03 09:23:34 +02:00
iceman1001 0f662846f4 updated helptexts 2020-04-03 09:11:12 +02:00
iceman1001 98553439aa change 'hf iclass readtagfile' - improved param handling, better helptext, f filename s startblock e endblock 2020-04-03 08:36:55 +02:00
iceman1001 1b6164be07 change, sprint_hex no long has an extra space in the end. This will break some output designs 😄 2020-04-03 08:35:32 +02:00
iceman1001 3484cf1655 text and return codes 2020-04-03 07:22:54 +02:00
iceman1001 4418281284 chg: 'hf mfu ndef' - text record now correctly decode language and text parts. Thanks @bettse! 2020-04-02 21:16:28 +02:00
Iceman ae44e21f93
Merge pull request #634 from dunderhay/master
Add colour to hf mf chk and fchk output
2020-04-02 19:50:17 +02:00
merlokk 13d3b38eee byte order according to http://apps4android.org/nfc-specifications/NFCForum-TS-Type-2-Tag_1.1.pdf
page 10,
sample: page 31
2020-04-02 20:26:46 +03:00
merlokk 627499247f TLV ndef lock and memory control decoding 2020-04-02 20:21:51 +03:00
merlokk e64e5fb65c added some ndef tlv types 2020-04-02 18:42:44 +03:00
Daniel Underhay f0ffe79569 Add colour to hf mf chk and fchk output 2020-04-03 00:14:15 +11:00
iceman1001 16110985ca text 2020-04-02 09:34:52 +02:00
iceman1001 47d43cfc56 text 2020-04-02 09:34:03 +02:00
iceman1001 61e59fa913 fix: 'hf mfu ndef - sig2 uses wrong index 2020-04-02 09:25:04 +02:00
iceman1001 3b4d5b5676 remove dublicate 2020-04-02 08:25:24 +02:00
iceman1001 b91c4977af textual 2020-04-02 08:14:31 +02:00
iceman1001 761860656e more pulic keys (@anon) 2020-04-02 08:09:18 +02:00
iceman1001 1bb9b2b112 chg: fixed the h param in filename became help bug 2020-04-02 07:55:35 +02:00
iceman1001 0c7ae02da4 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-02 06:39:40 +02:00
iceman1001 d67c55cd2a entries from taginfo app\n removed duplicates 2020-04-02 06:38:45 +02:00
iceman1001 cc6fda9b75 added checks for unknown public keys 2020-04-01 15:54:59 +02:00
iceman1001 07d16bba51 added some more originality keys 2020-04-01 15:10:50 +02:00
iceman1001 3f54fdf252 textual 2020-04-01 09:49:11 +02:00
iceman1001 b0a76d5f02 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-01 09:28:14 +02:00
iceman1001 d633340a1a Chg: 'data ndef' - cleaner output if called with no hex 2020-04-01 09:26:39 +02:00
iceman1001 83e92c6455 Add: 'hf mfu ndef' - read and parse NDEF type2 records 2020-04-01 09:25:54 +02:00
merlokk 737ebf9ab8 ndef signature1 length fix 2020-03-31 19:26:09 +03:00
merlokk 6d3c13c49a fix mfp behavior in info command 2020-03-31 19:13:03 +03:00
merlokk 5b9c51fb7e signature decode r and s works 2020-03-31 18:30:44 +03:00
merlokk 38004f9db5 decode works 2020-03-31 18:25:17 +03:00
merlokk 74243fcb03 signatures v1 and v2 2020-03-31 18:09:41 +03:00
iceman1001 8dd19a00c5 support v2.0 ndef sigs 2020-03-31 16:11:01 +02:00
iceman1001 5618f71ac7 textual 2020-03-31 15:56:34 +02:00
iceman1001 160f150dce fixing NDEF 2020-03-31 15:47:33 +02:00
iceman1001 6eb36c5438 added new command 'data ndef' - for easy decoding of NDEF messages inside pm3 client 2020-03-31 15:33:07 +02:00
iceman1001 e13a25902f added more sigs 2020-03-31 08:11:27 +02:00
iceman1001 978dde98a9 added more sigs 2020-03-31 08:06:45 +02:00
iceman1001 8eef5d188c fix coverity 226432 2020-03-30 22:25:00 +02:00
iceman1001 4178017536 chg: hf legic dump - change filename template 2020-03-30 15:18:25 +02:00
Iceman a1ae0523ac
Merge pull request #626 from Windslab/patch-1
textual
2020-03-29 07:53:13 +02:00
iceman1001 a79a11256a revert 2020-03-29 07:48:01 +02:00
Winds 9356549bc6
textual
Correcting a script name
2020-03-28 18:23:05 +03:00
iceman1001 82d99522b4 textual 2020-03-27 11:56:47 +01:00
iceman1001 ffb8ad9873 defaults 2020-03-26 21:04:58 +01:00
iceman1001 063b393eba textual 2020-03-26 20:36:38 +01:00
iceman1001 a9571d26b0 fix coverity 274113 2020-03-25 16:49:19 +01:00
iceman1001 6e49d94a82 fix coverity 205241 2020-03-25 16:35:31 +01:00
iceman1001 19a43d4726 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-03-25 11:20:47 +01:00
iceman1001 dc4bd2c1f7 fix: bizarr behavior in Proxspace lua, where io.read("*l") default behavior swaps to io.read("*L") . So lets make *L default a strip away all newlines... 2020-03-25 11:20:35 +01:00
iceman1001 0c25f85c9f empty string. 2020-03-25 11:19:20 +01:00
Iceman 04715cb2ea
Merge pull request #624 from darconeous/patch-1
Updates to the Tesla AIDs
2020-03-24 17:20:26 +01:00
Robert Quattlebaum f593efebf4
Re-added teslaStore AID, also added TeslaDAP AID 2020-03-24 09:18:16 -07:00
iceman1001 0033715a59 cppchecker 2020-03-24 13:35:33 +01:00
iceman1001 10243d9bce cppchecker - too many shifts 2020-03-24 13:16:47 +01:00
iceman1001 5acd681f8f cppchecker - too many shifts 2020-03-24 13:11:50 +01:00
iceman1001 0fbf7d6328 cppchecker - shadow 2020-03-24 13:06:09 +01:00
iceman1001 a8aadb2751 cppchecker missing includes 2020-03-24 11:45:57 +01:00
iceman1001 f5a8b0601b fix: coverity 274220 2020-03-24 11:33:52 +01:00
iceman1001 4f78edff31 textual 2020-03-24 11:31:23 +01:00
iceman1001 1e37c57729 chg: hf mfdes info - adapted to support multiple keys 2020-03-24 09:50:17 +01:00
Robert Quattlebaum bc6de92771
Updates to the Tesla AIDs
Now includes the AIDs that are used in the key fob and phone.
Removed some AIDs that can't be selected.
2020-03-23 21:32:20 -07:00
BarikMana d6f6f81094
Bosch Solution 6000 Key Sector 0 Key A&B
Works with any Bosch Solution 6000 PR11xB reader.
2020-03-22 23:44:06 +09:00
Iceman e255571a02
Merge pull request #620 from mwalker33/Keri-MS
Keri ms clone support with fc and cardid
2020-03-22 08:54:24 +01:00
iceman1001 8319b18bc7 chg: hf mf sim - adapt number of sectors to print on type 2020-03-22 08:10:10 +01:00
mwalker33 1df6782312 Update cmdlfkeri.c
Card ID change to CN/Card Number
2020-03-22 17:47:35 +11:00
mwalker33 dfe36a2d60 Update cmdlfkeri.c
Code clean and tune
2020-03-22 11:55:38 +11:00
iceman1001 fc1c133c46 fix: script hf_bruteforce - ensure zeropadding 2020-03-21 23:13:41 +01:00
iceman1001 64e027faf7 chg: unify dump file template used in this repo. hf-mf-(uid)-dump.(bin/eml/json) is the prefeered style. 2020-03-21 20:58:20 +01:00
iceman1001 dd3bd72af4 chg: 'hf 15 dump' - add basic json format when saving\nchg: 'hf 15 restore' - match file template to hf-(tyoe)-(uid)-dump.(extension) 2020-03-21 20:38:58 +01:00
iceman1001 5ceb83673f save json, added basic support for 14b/15/t555/legic 2020-03-21 20:34:57 +01:00
iceman1001 7e97062381 change for bionic only to zero out if set 2020-03-21 20:18:42 +01:00
iceman1001 9a2fc52a92 closing files are use... 2020-03-21 12:40:16 +01:00
iceman1001 80f79b1066 swap to live execution 2020-03-21 12:37:40 +01:00
iceman1001 e80eb37b5e more rework 2020-03-21 12:34:58 +01:00
mwalker33 4175297f57 Update cmdlfkeri.c
help update
2020-03-21 21:42:00 +11:00
mwalker33 6440f4c5b0 Update cmdlfkeri.c 2020-03-21 21:36:37 +11:00
mwalker33 3125812f93 Update cmdlfkeri.c
Added clone for FC and CardID
2020-03-21 20:08:11 +11:00
iceman1001 4443ae5500 rework script 2020-03-21 10:04:03 +01:00
iceman1001 19aa618fbd keys 2020-03-21 10:03:36 +01:00
Iceman 8ee03cb5e6
Merge pull request #615 from mwalker33/Keri-MS
Update cmdlfkeri.c
2020-03-21 09:42:29 +01:00
mwalker33 d870b52d7b Update cmdlfkeri.c 2020-03-21 13:37:33 +11:00
iceman1001 be3932d3c0 textual 2020-03-19 12:05:48 +01:00
iceman1001 7a1c65d1af chg: hf mfdes info - refactored a bit. \nchg: hf mfdes enum - now works again 2020-03-19 12:05:29 +01:00
Iceman b4cc0119d8
Merge pull request #612 from Windslab/master
Create hf-writer.lua
2020-03-19 11:25:10 +01:00
Winds 4bbe0827f5 Update hf-writer.lua
Add the possibility for a -h helptext param
2020-03-19 12:29:39 +03:00
iceman1001 37011158e1 chg: hf mfp info - more text / better detection between DESFire and Plus 2020-03-19 09:26:56 +01:00
iceman1001 3947528996 optional color for serial text in prompt 2020-03-19 05:44:47 +01:00
Winds 6b30e1ab00 Update hf-writer.lua
Adapted your script to the coding standards
2020-03-18 13:39:10 +03:00
iceman1001 eab2ebafae added pwdgen test 2020-03-17 17:12:27 +01:00
iceman1001 6783986fca hf mfdes info - textual 2020-03-17 13:41:46 +01:00
iceman1001 53d00dc7c3 whitespace 2020-03-17 13:40:28 +01:00
iceman1001 e9b293e8e9 hf mfp info - textual / colours 2020-03-17 13:38:51 +01:00
Winds 9ff3ed2933 Create hf-writer.lua 2020-03-17 13:37:38 +03:00
iceman1001 fe0d9c8d9f hf mfdes enum - fixes WIP 2020-03-17 11:37:38 +01:00
iceman1001 8cf88c5cd5 hf mfdes info - textual 2020-03-17 02:30:25 +01:00
Marlin Sööse 6d7682fdb3
Update mfc_default_keys.dic 2020-03-16 21:04:46 -04:00
iceman1001 1cb495e40b add desfire light signature verification check 2020-03-17 01:50:27 +01:00
iceman1001 7a7a3d014e hf mfdes info - remake to work with Desfire Light. Switch to apdu framing. WIP 2020-03-16 21:51:45 +01:00
iceman1001 8341309754 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-03-16 21:45:40 +01:00
iceman1001 3fa86bf80b iceman needs his coffee 2020-03-16 21:45:17 +01:00
Philippe Teuwen 0a616d61f7 less emoji 2020-03-16 21:45:08 +01:00
Philippe Teuwen c769d661f1 emoji -> alttext in logfiles 2020-03-16 21:34:42 +01:00
iceman1001 9f787faea6 remove var 2020-03-16 18:43:24 +01:00