Commit graph

4393 commits

Author SHA1 Message Date
Philippe Teuwen c6ac4056d3 fix iclass txt 2019-08-30 02:01:14 +02:00
Philippe Teuwen 5b6af929ab move oid.json to resources/ 2019-08-30 02:00:41 +02:00
Philippe Teuwen af65beb987 move aidlist.json to resources/ 2019-08-30 01:23:50 +02:00
Philippe Teuwen ca8aee33ea move iclass_dump.bin in resources/ 2019-08-30 01:23:10 +02:00
Philippe Teuwen de5c5df732 remove debug print 2019-08-30 00:08:31 +02:00
iceman1001 4d073ae19d mv iclass_dump.bin one folder up 2019-08-29 21:49:54 +02:00
Philippe Teuwen 73cefedd61 remove entirely ncurses, not needed nowadays 2019-08-29 18:22:14 +02:00
iceman1001 6529c9616f chg: remove termcap and use pkg-config for ncurses (@ZeroChaos-) 2019-08-29 16:56:22 +02:00
iceman1001 f3a63767ed chg: 'hf iclass loclass t' - now uses loadfile_safe. However the iclass_key.bin and iclass_dump.bin must be in the new folder structure 2019-08-29 15:55:52 +02:00
iceman1001 00f82304e2 chg: 'hf iclass loclass t' - now uses loadfile_safe 2019-08-29 14:33:09 +02:00
iceman1001 f0d73dc3d1 chg: 'hf iclass decrypt' - now takes transport key as param. also search for key / dump. Also saves decrypted to bin/eml/json_decref
chg: 'hf iclass encrypt' - now takes transport key as param.
2019-08-29 14:17:39 +02:00
Philippe Teuwen 0d6a29197b rework OS/ARCH info 2019-08-29 11:10:54 +02:00
iceman1001 74f96be6be textual 2019-08-29 10:46:57 +02:00
iceman1001 c3c5011e1d textual 2019-08-29 10:36:48 +02:00
Philippe Teuwen b10edbaddc user dir: rework err msgs 2019-08-29 10:31:37 +02:00
Philippe Teuwen fcd9b42dca reintroduce _stat on mingw, needed to strip path 2019-08-29 10:07:40 +02:00
iceman1001 6e54adcb7c fix: 'hw version' - identifing os on unknown.. 2019-08-29 09:53:28 +02:00
iceman1001 979f3aba2e chg: 'hf iclass chk'
chg: 'hf iclass lookup'  - use fileutils load dictionary instead.

chg: 'hf iclass encrypt' - start w change to allow for key parameter
2019-08-29 07:47:17 +02:00
iceman1001 3683cd88c6 chg: 'hw version' - simple os detection. 2019-08-29 07:45:09 +02:00
Matthias Konrath a69fbdd3af Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into autopwn_restyle 2019-08-29 06:17:27 +02:00
Philippe Teuwen 430c53a7ac Fix buffer allocation again, just getting rid of it 2019-08-28 23:51:52 +02:00
Philippe Teuwen aa77f7298c Fix buffer allocation for showing compiler version 2019-08-28 23:28:28 +02:00
Philippe Teuwen 11c7db3523 Get ~/.proxmark3 working on Mingw 2019-08-28 23:07:23 +02:00
Philippe Teuwen d2d58db985 Move history and logfile to ~/.proxmark3 2019-08-28 21:53:31 +02:00
iceman1001 117ebf0beb chg: 'hf mf ecfill' - now uses NG format.
chg: 'hf mf eload'  - now uses NG format.
chg: 'hf mf fchk m' - now uses ecfill trick,  if fchk got all keys,  it will dump the card directly.
    sample:
         hf mf fchk 1 m     (must have dictionaries uploaded to device) if all keys are found,  you can now run
         hf mf esave         to get a complete dump.
2019-08-28 21:21:27 +02:00
iceman1001 8d9751ebe4 fix: uint cant be negative.. 2019-08-28 21:16:09 +02:00
iceman1001 ad3fe38b45 fix: loaddictionary_save, now with correct mem clear. 2019-08-28 21:15:32 +02:00
iceman1001 f3ab9632f0 return values 2019-08-28 21:12:32 +02:00
Philippe Teuwen cbca61f6ba searchAndList: hide temptative repo path 2019-08-28 19:25:15 +02:00
Matthias Konrath e4159b7cb3 Cleaned up the ouput to be as minimalistic as possible. Now the verbose flag output is realy verbose. 2019-08-28 18:39:01 +02:00
Matthias Konrath 2e29b361c5 Restyled the autopwn command output according to @doegox 2019-08-28 15:57:21 +02:00
Matthias Konrath 6c76e2ed5b Restyled to the autopwn command output. 2019-08-28 14:20:52 +02:00
Iceman 86790df6e7
Merge pull request #364 from matthiaskonrath/load_dictionary_safe
Implementation of a function to safely load a dictionary
2019-08-28 12:55:08 +02:00
Matthias Konrath 5167507a83 Fixed the loadFileDICTIONARY_safe memset alignment. Thanks to @doegox for pointing that out. 2019-08-28 12:14:40 +02:00
Matthias Konrath 2290b2bd88 Fixed the description of the loadFileDICTIONARY_safe function. 2019-08-28 11:30:30 +02:00
Matthias Konrath 7237a9638b Removed debugging stuff. 2019-08-28 11:19:54 +02:00
Matthias Konrath e259b26d60 Streamlined the naming conventen and types. 2019-08-28 10:45:45 +02:00
Matthias Konrath 7eb79732ff Added security features to the loadFileDICTIONARY_safe function (memset after a realloc). 2019-08-28 10:38:56 +02:00
Matthias Konrath 1ce10cfea6 Added additional checks (loadFileDICTIONARY_safe). 2019-08-28 10:09:01 +02:00
Matthias Konrath ae7b0de2c9 Fixed a typo and added and improved the checks for the returned data of loadFileDICTIONARY_safe. 2019-08-28 09:49:21 +02:00
Matthias Konrath 9dc3c39a95 Added additional checks to the from load dictionary returned data points. 2019-08-28 09:45:11 +02:00
Matthias Konrath 225b18d5fc Implemented a function to safely load dictionaries. 2019-08-28 09:34:46 +02:00
Philippe Teuwen 254beefda2 Fix mingw utf8->cp850 support 2019-08-28 00:03:27 +02:00
Philippe Teuwen 4fe7c7c9fa remove utf8 dashes 2019-08-27 23:17:02 +02:00
iceman1001 4b8c80ec33 return values.. 2019-08-27 21:56:03 +02:00
Matthias Konrath a0c2de5602 Added an key found message to the read b key with a key feature. 2019-08-27 20:28:28 +02:00
Matthias Konrath 42d58cbced fixed the read B key features error handling. 2019-08-27 19:55:45 +02:00
Matthias Konrath c9a02adc70 Added the read B key with known A key feature, and minor changes to the UI (alignment). 2019-08-27 19:45:37 +02:00
Matthias Konrath 02c1657594 Added some found keys to the dictionary. 2019-08-27 19:17:52 +02:00
Philippe Teuwen d88b76beda partial make style 2019-08-27 17:28:08 +02:00
iceman1001 13aa4ee6ab fix: cleaning up 'hf mf autopwn' - reused the fix from below aswell.
Add: 'hf mf dump'  rename filenames (@mohemiv) see https://github.com/RfidResearchGroup/proxmark3/pull/360
2019-08-27 17:15:42 +02:00
iceman1001 703329faca chg: add used known key to found list :) 2019-08-27 11:08:03 +02:00
iceman1001 48d3802d35 chg: optimization of iclass mac calculations on deviceside (@pwpiwi) see https://github.com/Proxmark/proxmark3/pull/861
chg: some textual
2019-08-27 10:51:52 +02:00
Matthias Konrath 1e648088b1 Improved the help message of the autopwn command. 2019-08-26 22:54:59 +02:00
Philippe Teuwen 16a7cfd7b2 make style (excepted cmdhficlass...) 2019-08-26 22:28:39 +02:00
Philippe Teuwen 9c677e045e mf autopwn: try nested harder before hardnested; typos 2019-08-26 22:21:23 +02:00
Philippe Teuwen d838c81601 hf mf attacks: rewordings 2019-08-26 20:57:23 +02:00
Philippe Teuwen 1368595be1 hf mf nested: swap loops for faster results (try harder to break keyA first) 2019-08-26 20:37:33 +02:00
Philippe Teuwen bdd6ef98b5 fix autopwn help 2019-08-26 20:34:16 +02:00
Iceman d548b8daeb
Merge pull request #353 from matthiaskonrath/hardnested_autopwn
Autopwn
2019-08-26 15:12:21 +02:00
Matthias Konrath 236c2eb1d0 Changed createKeyDump to a less generic name (createMfcKeyDump). 2019-08-26 14:29:21 +02:00
Philippe Teuwen 1628ac8e62 revert temporarily hf iclass chk/lookup 2a1e6dff 2019-08-26 13:55:42 +02:00
Philippe Teuwen 7076df0e18 hf mf chk/fchk: don't stop on line errors when parsing dict 2019-08-26 13:53:23 +02:00
Philippe Teuwen 6ac9d2f0fb lf t55xx chk: load dic with searchFile 2019-08-26 13:46:53 +02:00
Philippe Teuwen 2a1e6dff80 hf iclass chk/lookup: load dic with searchFile and fail when errors in args 2019-08-26 13:36:37 +02:00
Philippe Teuwen 4ddc3d61d5 hf mf chk/fchk: load dic with searchFile and fail when errors in args 2019-08-26 13:21:03 +02:00
Matthias Konrath 2edee59837 Changed the variable names, added aditional dictionary size checks, fixed a corner case with the key transferes. 2019-08-26 12:27:40 +02:00
iceman1001 2e4c7f4f8d chg: reuse code 2019-08-26 10:52:07 +02:00
Matthias Konrath 13641771ba Improved help message, implementation of a verbose option (to reduce the output), corrected some spelling mistakes and cleaned up variable names. 2019-08-25 22:24:52 +02:00
Matthias Konrath 47b2c5ddc6 Removed old command options. 2019-08-25 11:16:10 +02:00
Matthias Konrath bd01b7bd96 Now the keys are transfered to the simulator memory and the whole card gets dumped at the end. 2019-08-25 11:13:53 +02:00
Matthias Konrath 7dbb5427ea Transformation from hardautopwn to autopwn, now are all the mifare classic attacks automated. 2019-08-24 18:11:03 +02:00
iceman1001 f9d8d56317 add iclass json dump format 2019-08-24 13:16:28 +02:00
Philippe Teuwen ec174a7232 better searchFile api 2019-08-24 07:51:24 +02:00
Philippe Teuwen 7ab7d68a26 calloc in fileutils 2019-08-24 07:18:45 +02:00
iceman1001 c6145a81c2 chg: iclass commands 2019-08-24 05:08:03 +02:00
Philippe Teuwen 9d05628c3c mem load: update examples 2019-08-23 23:21:20 +02:00
Philippe Teuwen b09849c91b pull filenamemcopy out of searchFile 2019-08-23 23:07:05 +02:00
Philippe Teuwen 4b95be1b39 searchFile: search also implicit relative path 2019-08-23 22:09:54 +02:00
Philippe Teuwen 8c26e07ceb use searchFile to find dictionaries 2019-08-23 22:08:36 +02:00
Philippe Teuwen 34a0fdb9d6 reorganize lua script dir defs 2019-08-23 22:07:45 +02:00
Philippe Teuwen 31e430744b searchFile: use filenamemcopy 2019-08-23 21:49:58 +02:00
Philippe Teuwen e0cdb5d7a7 makefile: allow override of install paths 2019-08-23 21:07:20 +02:00
Philippe Teuwen c709ee7c10 rework PREFIX for future make install 2019-08-23 20:55:50 +02:00
Matthias Konrath 87cbf3aa70 Improved the reliability, speed and redability. Ready for a pull mr. iceman ;) 2019-08-23 17:17:17 +02:00
Iceman 4b2b103e80
Update mfc_default_keys.dic
data from forum,
2019-08-23 15:23:55 +02:00
Philippe Teuwen 440c05cdfa searchFile accepts also explicit absolute or relative path 2019-08-23 00:08:19 +02:00
Philippe Teuwen 3ebc00854b Add searchAndList & searchFile in fileutils 2019-08-22 23:55:37 +02:00
Philippe Teuwen e8efeacc57 remove ON_DEVICE from fileutils 2019-08-22 23:07:52 +02:00
Philippe Teuwen 77c86099cc clean and uniformise dic files 2019-08-22 22:58:16 +02:00
Philippe Teuwen 23044c00d0 rename and move dict files 2019-08-22 22:16:33 +02:00
Philippe Teuwen 915c200ebc luascript: use fileExists 2019-08-22 21:18:37 +02:00
Philippe Teuwen 72392ab305 fileutils: fix rel path to includes 2019-08-22 21:18:14 +02:00
Philippe Teuwen 9825f521b4 Fix clang issue where generated .d are sometimes newer than .o 2019-08-22 21:05:45 +02:00
Philippe Teuwen 40b6956a22 script list: print dir tree 2019-08-22 19:53:23 +02:00
Philippe Teuwen 595b8a1885 introduce PREFIX for pm3 system directory and move to common.h 2019-08-22 19:36:20 +02:00
iceman1001 ab38130c3e chg: some more checks in pathing 2019-08-22 17:44:08 +02:00
Matthias Konrath abb69e2dc9 Further improved the hardautopwn feature. 2019-08-22 14:55:06 +02:00
Matthias Konrath 407078d90a Experimental hardautopwn implementation. 2019-08-22 12:49:26 +02:00
Philippe Teuwen 9ae27cd73c scripts list / scripts run: look also in the new lua scripts paths 2019-08-22 00:32:15 +02:00