Commit graph

4362 commits

Author SHA1 Message Date
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
Philippe Teuwen 3c6500a1b2 Lua: look for scripts also in ~/.proxmark/{luascripts,lualibs} and /usr/local/share/proxmark3/... 2019-08-21 23:53:27 +02:00
Philippe Teuwen a8ee33baf4 change scripts/ to luascripts/ 2019-08-21 23:17:01 +02:00
Philippe Teuwen fb00690957 rename and +x few eml helper scripts 2019-08-21 22:45:06 +02:00
Iceman 56267ea623 readd fileutils 2019-08-21 14:43:22 +02:00
Iceman a0f261c1e0 chg: moved fileutils from loclass 2019-08-21 14:41:33 +02:00
Iceman 4e627f09c0 add: proxmark3 -v/--version - for easiness to detect version in offline mode and installs 2019-08-21 12:52:59 +02:00
Iceman fea5d88278 add: detect unfused / write once magic tags, from https://github.com/nfc-tools/libnfc/pull/554 2019-08-20 14:53:52 +02:00
Philippe Teuwen 589f1e9d3e client/Makefile: add missing deps 2019-08-19 21:50:16 +03:00
Philippe Teuwen 0449527e2a adapt client/Makefile to new mbedtls & zlib way of working, remove unneeded dirs 2019-08-19 21:50:16 +03:00
Philippe Teuwen 0115efe190 isolate reveng, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen 6ebae499aa rework fpga_compress & isolate zlib: use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen aebfe0af19 rework mfkey Makefile and move util_posix to common, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen 829934886f rework tinycbor Makefile, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen 7b78833800 rework liblua Makefile and skip clients compilation, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen 9767c075d9 rework jansson Makefile, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen f4c810f83b allow override of CFLAG & alike, remove /opt paths 2019-08-19 21:50:16 +03:00
iceman1001 f06846e2d0 chg: 'hf iclass loclass' - break attack earlier if one csn byte recovery fails. No need to try run it. and some colors... 2019-08-19 20:24:08 +02:00
Philippe Teuwen ab2100879e Get btpin/btfactory available in FPC DEV builds 2019-08-19 17:47:11 +02:00
root 63b47a003e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-18 17:06:58 +02:00
iceman1001 f2e77bfbe4 chg: some tabs converted 2019-08-17 15:59:11 +02:00
Philippe Teuwen 4d16f3e7d2 fix reveng: unsigned long on Mingw64 is only 32b, hopefully limits.h can help 2019-08-15 19:24:50 +02:00
Philippe Teuwen f008b965d5 missing include 2019-08-14 23:06:14 +02:00
root d770e4c57a remove debugstatements 2019-08-14 22:59:14 +02:00
Philippe Teuwen a187968967 Hmm, let's try to fix reveng on 32b 2019-08-14 22:19:52 +02:00
Philippe Teuwen 2f029d0d9d remove comment 2019-08-14 21:54:43 +02:00
Philippe Teuwen ea601f4052 fix reveng for all platforms else than WIN32 2019-08-14 21:53:04 +02:00
Philippe Teuwen db0ac1639b em4x watch & read: collect enough samples to cover EM XL tags 2019-08-13 22:57:54 +02:00
Philippe Teuwen 252929bed4 fix lf read command parsing bug 2019-08-13 20:30:19 +02:00
cjbrigato 961f98c125 SPIFFS : FIXES FS corruption against high numbero f current losses, high number of files manipulation. FIXES LOG_BLOCK erasing handlers. FIXES Garbage Collector. Overall, SPIFFS should now be WAY MORE resilient to any form of misbehavior. In case of corrupted filesystem (should still be readable !), spamming 'mem spiffs check' from the client will ensure at least 2 new free 4k blocks each tile (if number of LOG_PAGE available is enough) and in the same pass will move/reorganize the LOG_PAGES of contextual blocks. Yiha 2019-08-13 17:39:48 +02:00
iceman1001 de1093d5d9 textual 2019-08-12 16:32:27 -04:00
iceman1001 bbc324f9fe follow status pattern 2019-08-12 16:31:57 -04:00