RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-22 08:16:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
7369 commits 3 branches 14 tags 86 MiB
Commit graph

4628 commits

Author SHA1 Message Date
Philippe Teuwen 9cf2cd7ca9 remove leading/tailing "/" from installation RELPATHs 2019-09-05 23:20:46 +02:00
iceman1001 1ca235e58f chg: hf iclass decrypt -d - now also reads enccrypted blockdata as param to decrypt 2019-09-05 22:39:30 +02:00
Iceman 3323126d7b adaption 2019-09-05 16:07:25 +02:00
Iceman c9d42699fb textual 2019-09-05 15:52:40 +02:00
Philippe Teuwen ecb535cc58 make style 2019-09-05 00:48:48 +02:00
Philippe Teuwen f8636b18db searchFile: HOME takes precedence on repo and installed paths, more coherent 2019-09-04 23:40:42 +02:00
Philippe Teuwen d84c039742 Example of shebang on Lua script 2019-09-04 23:36:23 +02:00
Philippe Teuwen 43055ae6a7 searchFile for cmdscripts 2019-09-04 23:29:03 +02:00
Philippe Teuwen 00ad68215b add cmdscript example 2019-09-04 23:28:19 +02:00
Philippe Teuwen 7594ea4942 skip comments in cmdscripts 2019-09-04 23:13:51 +02:00
Philippe Teuwen 2ddbbd255b data load: search file with and without extension .pm3 2019-09-04 22:53:54 +02:00
CristarIngram 15d8e246d8
more mfc keys 2019-09-03 16:10:22 +02:00
Philippe Teuwen bccb9069f9 prepare libamiibo.a inclusion 2019-09-03 00:18:43 +02:00
Philippe Teuwen f7f80a9b9f fido2: fix fido assert loading file 2019-09-02 22:51:28 +02:00
Philippe Teuwen 002580b6d4 fido: fix typos 2019-09-02 22:48:25 +02:00
iceman1001 f1d31f1e43 chg: 'mem load' - use loadxxxx_safe method 2019-08-31 21:49:59 +02:00
iceman1001 3352904f1d chg 'mem spiffs load' - use loadfile_safe 2019-08-31 21:47:31 +02:00
iceman1001 5ff9cbaac0 fix: 'hf iclass eload' - load file works again. 2019-08-31 15:25:36 +02:00
Philippe Teuwen 7e579f9fca rename SIMxxx.BIN in lowercase 2019-08-30 22:13:51 +02:00
Philippe Teuwen f6a4f9cbe3 move client scripts to tools 2019-08-30 22:11:02 +02:00
Philippe Teuwen 3245260c00 Add Makefile.defs with common defs 2019-08-30 22:10:06 +02:00
Philippe Teuwen d772c6169a rename flasher -> proxmark3-flasher 2019-08-30 21:57:43 +02:00
Philippe Teuwen 4fdb5a2f4b make install: half way 2019-08-30 21:55:13 +02:00
Philippe Teuwen b5f5b9276f make install skeleton 2019-08-30 21:44:40 +02:00
Philippe Teuwen 4d31b2399b reintroduce PREFIX and use relative paths for finding share/ when installed, independently of PREFIX 2019-08-30 21:36:10 +02:00
iceman1001 e1e5687e32 add: lua scripts can now search for files. 2019-08-30 14:53:53 +02:00
Oleg Moiseenko 4433f8982c
Appveyour fix paths (#379) 2019-08-30 13:55:35 +03:00
Philippe Teuwen 2022df1068 make style 2019-08-30 10:45:52 +02:00
Philippe Teuwen 2c853d94ea move hardnested tables to resources/ 2019-08-30 09:02:01 +02:00
Philippe Teuwen eba13925e4 move bf_bench_data.bin to resources/hardnested_* 2019-08-30 08:53:24 +02:00
iceman1001 0771f0ae95 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-30 08:52:06 +02:00
iceman1001 f6fa2c4651 moved to docs 2019-08-30 08:51:55 +02:00
Philippe Teuwen 08a5de1f0e searchFile traces 2019-08-30 08:32:34 +02:00
Philippe Teuwen 40709f4536 move defparams.json to resources/emv_defparams.json 2019-08-30 02:18:14 +02:00
Philippe Teuwen 382129205f move capk.txt to resources/ 2019-08-30 02:10:55 +02:00
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
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
Philippe Teuwen 01ce580e7b make btpin & btfactory accessible in BTADDON builds 2019-08-12 18:58:28 +02:00
Colin J. Brigato cb39be8c47
Fixes Compilation on OSX 2019-08-12 12:39:16 +02:00
Philippe Teuwen 47b60d84de make style 2019-08-11 23:53:45 +02:00
Philippe Teuwen 8b0a80ec98 add missing include for whereami.c in android 2019-08-11 21:42:01 +02:00
Philippe Teuwen 3e96c27c18 remove clang warning 2019-08-11 21:42:01 +02:00
Philippe Teuwen 80b4e81130 Fix fpga_compress race condition and isolate it in tools 2019-08-11 21:42:01 +02:00
Philippe Teuwen d19754567d summer restructuring: 
* .h include only the strict minimum for their own parsing
  * this forces all files to include explicitment their needs and not count on far streched dependencies
  * this helps Makefile to rebuild only the minimum
  * according to this rule, most standalone .h are now gone
  * big app.h is gone
  * remove seldom __cplusplus, if c++ happens, everything will have to be done properly anyway
* all unrequired include were removed
* split common/ into common/ (client+arm) and common_arm/ (os+bootloader)
  * bring zlib to common/
  * bring stuff not really/not yet used in common back to armsrc/ or client/
  * bring liblua into client/
  * bring uart into client/
  * move some portions of code around (dbprint, protocols,...)
* rename unused files into *_disabled.[ch] to make it explicit
* rename soft Uarts between 14a, 14b and iclass, so a standalone could use several without clash
* remove PrintAndLogDevice
* move deprecated-hid-flasher from client to tools
* Makefiles
  * treat deps in armsrc/ as in client/
  * client: stop on warning (-Werror), same as for armsrc/

Tested on:

* all standalone modes
* Linux
 2019-08-11 21:42:01 +02:00
Iceman b7d412d27b Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-10 21:04:25 +02:00
Iceman a36b784ecd chg: help text commands now green 2019-08-10 18:34:02 +02:00
Iceman 3f9613b87f chg: script run dumptoemul - better fail messages 2019-08-10 18:20:20 +02:00
Iceman b06274623f fix: hf iclass dump - now also save EML 2019-08-10 18:05:24 +02:00
Philippe Teuwen ceda9f9f4b
Merge pull request #310 from ViRb3/rework-help 
Rework hitag2 read/write help
 2019-08-09 22:16:21 +02:00
Philippe Teuwen 5051ea429d typo 2019-08-09 13:02:10 +02:00
Philippe Teuwen c58937b5f5 client: clean deps while cleaning objects 2019-08-09 12:12:22 +02:00
Philippe Teuwen 5a6c9e7863 hf tune: mask 32b dword to 16b 2019-08-07 13:04:36 +02:00
Philippe Teuwen bc28eb04e4 Revert 00350db and add waiting time extension request mechanism, see issue #265 2019-08-07 13:04:34 +02:00
Philippe Teuwen e057fa6fa0 Add time measurements of recv packets on client side 2019-08-07 13:04:31 +02:00
Philippe Teuwen 9b44590f8d make style 2019-08-07 13:04:26 +02:00
Philippe Teuwen 12a0540d91 mf sim: add option to pass explicitly atqa/sak and reject explicitly unknown vals for option t 2019-08-07 01:32:37 +02:00
Philippe Teuwen 4615354864 mf sim: respect DBG_NONE and explicit ATQA/SAK usage 2019-08-07 00:47:32 +02:00
Victor d158ffebfd Note that hitag1 read/write not yet implemented 2019-08-06 19:13:38 +01:00
Victor 67887a83d3 Rework hitag2 read/write help 2019-08-06 19:08:51 +01:00
Philippe Teuwen 1354aec556 typos 2019-08-06 13:51:10 +02:00
iceman1001 25748b0746 style 2019-08-05 12:01:11 -04:00
iceman1001 f317e3247a chg: 'lf nedap' - decoding / encoding of Nedap. (anon) 2019-08-05 17:43:53 +02:00
Philippe Teuwen 6f47e12797
Merge pull request #308 from cjbrigato/patch-1 
FIXes # 174 and more (OSX > 10.4 num_Cpus) the good way
 2019-08-05 00:41:20 +02:00
Philippe Teuwen 7a620ddaa7 remove redundant conditions 2019-08-05 00:31:51 +02:00
Colin J. Brigato 38e4e8d80c
FIXes OSX > 10.4 num_Cpus() the good and posix way 
sysconf() is  part of IEEE Std 1003.1-1988 (POSIX.1).
Fortunately, it *is* available to OSX `>=10.5`.
At least on `~10.14`, the old unposix `sysctl` osx way was lost, at least in portable environments.
This fixes it, but will not be compatible with OSX > 10.4. 
So i'm sorry but here we loose compatibility with Macs olders than 2005. (🤣)
 2019-08-05 00:27:15 +02:00
iceman1001 18d2c24e9e chg: 'trace list' - abort when ENTER key is pressed 2019-08-04 19:13:54 +02:00
Philippe Teuwen f40600f997 make style 2019-08-04 16:57:06 +02:00
Philippe Teuwen 1cb039255e Add client option -i to stay in interactive mode after a script or command 
From 5a3f474331
with some fix in the logical flow
 2019-08-04 15:34:18 +02:00
Philippe Teuwen 88d2a61c0b typo 2019-08-04 12:58:36 +02:00
iceman1001 a90e5e1858 chg: legic cmds uses return macros. 
chg: hf search started to use macros
 2019-08-03 23:36:55 +02:00
Philippe Teuwen 60bfc37f35 remove more dummy cmds 2019-08-03 22:52:32 +02:00
Philippe Teuwen 61538bd635 thinfilm simulation when on battery 2019-08-03 22:37:01 +02:00
Philippe Teuwen 25f358955b make hf search robust to various HF configurations 2019-08-03 22:14:12 +02:00
Philippe Teuwen 4a3fb3ccf1 split nfcbarcode from iso14443a 2019-08-03 22:14:12 +02:00
Iceman e4972e8810
Merge pull request #305 from ViRb3/better-warn 
Better warn user of hardcoded hitag info
 2019-08-03 20:01:18 +02:00
Philippe Teuwen 017b3357ed Comment Felica simulation in client, there is no corresponding code in ARM 2019-08-03 19:57:57 +02:00
Philippe Teuwen a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
Philippe Teuwen cbf5c717f7 Remove unused CMD_* 2019-08-03 19:48:02 +02:00
Victor a0193fa903 Better warn user of hardcoded hitag info 2019-08-03 18:29:02 +01:00
iceman1001 52065adcfa chg: 'hf topaz reader' - more verbose 2019-08-02 11:37:35 -04:00
iceman1001 0747cf9ec0 add more keys (@anon) 2019-08-02 09:48:42 -04:00
Philippe Teuwen ab74d2b798 Revert ARRAYLEN on whereami.c, bag of bones... 2019-08-02 08:06:30 +02:00
Philippe Teuwen 0eae1e2563 make style 2019-08-02 00:26:48 +02:00
Philippe Teuwen 865a7c3ad4 Add thinfilm simulation 2019-08-02 00:26:07 +02:00
Philippe Teuwen 824e0ae3e4 use thinfilm trace with hf thinfilm list 2019-08-01 20:15:46 +02:00
Philippe Teuwen 3bc5f7688d thinfilm trace 2019-08-01 20:06:07 +02:00
iceman1001 63a7f8a4c4 fix: 'hf topaz reader' - not crashing when trying to read a thinfilm 2019-08-01 12:36:50 -04:00
iceman1001 5a2d0c4cc1 chg: 'hf thinfilm info' - print text 2019-08-01 12:22:51 -04:00
iceman1001 2a054438ab chg: 'hf thinfilm info' - fixed manufacture lookup 2019-08-01 12:16:33 -04:00
Philippe Teuwen 7bdcf3cff5 thinfilm, show raw data if unknown encoding 2019-08-01 18:03:41 +02:00
Philippe Teuwen 85c0f3e9e3 thinfilm partial info when verbose 2019-08-01 17:49:35 +02:00
iceman1001 10c949a47e chg: 'hf thinfilm info' - versbose mode and sanity checks 2019-08-01 11:33:00 -04:00
iceman1001 2400418067 style 2019-08-01 11:15:39 -04:00
iceman1001 faf68081b0 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-01 11:11:07 -04:00
iceman1001 a331090c6a Chg : 'hf thinfilm info' - added crc check 2019-08-01 11:09:51 -04:00
Philippe Teuwen 8f6c048481 thinfilm: fix urls with 0xFE terminator 2019-08-01 17:07:07 +02:00
Philippe Teuwen 3fb442798d thinfilm usage typo 2019-08-01 15:49:58 +02:00
iceman1001 fbff51c88d Add: hf thinfilm info - support to read and decode Kovio Thinfilm NCT tags 2019-08-01 09:39:33 -04:00
Philippe Teuwen 733a7d836d more ARRAYLEN 2019-08-01 00:14:09 +02:00
Philippe Teuwen f276dca3f1 less hardcoded sizes and more ARRAYLEN 2019-07-31 23:45:17 +02:00
iceman1001 74288ad128 chg: hf topaz - got some love 2019-07-31 15:43:00 -04:00
Philippe Teuwen 98624037ad hf mfu: please no extended ascii char 2019-07-31 12:43:15 +02:00
Philippe Teuwen f0c939b1bc hf mfu: avoid hardcoded array size 2019-07-31 12:14:44 +02:00
Philippe Teuwen 5edd342d4c Add NTAG_I2C_1K support to hf mfu, thanks JP Szikora 2019-07-31 12:04:32 +02:00
iceman1001 4c9b95c216 chg: flash messge 2019-07-30 14:31:10 -04:00
iceman1001 6d1c996251 chg: flashing - test messages 2019-07-30 19:22:24 +02:00
netvader 8abbbe4d5e
Update default_keys.dic 
add hotel key from alltours
 2019-07-29 11:03:20 +02:00
Philippe Teuwen c6b8e199fd fix usart cmd descriptions 2019-07-28 21:08:50 +02:00
Philippe Teuwen c83ff9da0f make style 2019-07-28 19:24:00 +02:00
Philippe Teuwen 5854ab19dd client tells when over TCP 2019-07-28 19:23:37 +02:00
iceman1001 a25814bda4 ADD: 'trace list' - annotate nano signature 2019-07-28 14:23:30 +02:00
iceman1001 00350db238 Chg: hf tune - increase timeout vaules. fix #265 2019-07-28 03:29:31 -04:00
iceman1001 c5b8df449d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-07-28 09:22:30 +02:00
iceman1001 ca53711b8d chg: lf t55xx - helptext 2019-07-28 09:21:02 +02:00
iceman1001 9f4620c92c make style 2019-07-27 17:48:52 -04:00
iceman1001 f433e26e3b Add: 'hf mfu info' - now does orinality check against ECC. (@pwpivi) 
Adapted to prefered codestyle and added references.
 2019-07-27 23:44:23 +02:00
iceman1001 283060f962 chg: renaming a struct 2019-07-27 21:15:43 +02:00
iceman1001 e99910694b chg: some more key, thanks @Ollibolli 2019-07-27 15:06:58 +02:00
iceman1001 d7c967b65d chg: 'codestyle' 2019-07-27 10:25:03 +02:00
iceman1001 e9b493ead6 style 2019-07-27 02:39:30 -04:00
Iceman b7ba46d38e
Merge pull request #292 from netvader/patch-1 
Update default_keys.dic
 2019-07-26 23:53:15 +02:00
netvader 54a18ebf2b
Update default_keys.dic 
added some keys from clever fit gym, hotel room turkey, and simonsvoss key card
 2019-07-26 22:45:16 +02:00
3ldidi94 ee152657c6
Add one more key 
Found a new key that is not in this dic file, so I add it.
 2019-07-26 11:43:21 +02:00
mwalker33 9085465c38 Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-25 21:00:41 +10:00
mwalker33 3211f35062 Added set default timings 2019-07-25 21:00:30 +10:00
mwalker33 b222161941
Merge branch 'master' into master 2019-07-25 20:12:00 +10:00
mwalker33 77d96ff3b7 Bug Fix Timing order 
Timing for backward compatibility
 2019-07-25 20:01:03 +10:00
Philippe Teuwen c0eb19acb1 remove tabs 2019-07-24 00:52:24 +02:00
mwalker33 b16f2fdaba Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-24 08:15:38 +10:00
mwalker33 cdc3787008 clean 2019-07-24 08:12:25 +10:00
Philippe Teuwen ab043a68b8 remove space in filename 2019-07-23 23:44:41 +02:00
Philippe Teuwen ac233a346a make style 2019-07-23 23:43:30 +02:00
Philippe Teuwen ac18114909 Remove long unsigned int warning 2019-07-23 22:46:58 +02:00
Philippe Teuwen 11e5131604
Merge pull request #284 from mwalker33/master 
T55x7 Downlink mode support added
 2019-07-23 22:42:47 +02:00
Philippe Teuwen 7e84a546c5 GetFromDevice leftovers 2019-07-23 21:45:06 +02:00
Philippe Teuwen 544fb30ce6 typos 2019-07-23 21:40:01 +02:00
Philippe Teuwen 9beabaabf5 make style 2019-07-23 21:33:52 +02:00
mwalker33 5de04f84e9 Restored * 8 
Revert back to store and use the full value (*8) for the timing.
 2019-07-23 20:12:05 +10:00
cjbrigato 70cd0d844b FIX : Tereifying typo 2019-07-23 07:39:34 +02:00
mwalker33 4e0e69ed63 Added T55 downlink mode support 2019-07-23 09:50:28 +10:00
cjbrigato 5c3676ad81 ADD: Early SPIFFS implementation see #257, UPDATE HF_COLIN accordingly 2019-07-22 22:56:06 +02:00
Philippe Teuwen daae890667 Bootrom & flasher changes: 
* use macros for versions
* activate UNDERSTANDS_VERSION in bootrom
* fix missing break; bug in bootrom
* force flash_load to reject images > 256k if bootloader not up to date
* move logic from flasher to flash
 2019-07-20 10:48:40 +02:00
slurdge 68aa9d631d Flasher support for versionning 
Only bootrom with version > 1.0.0 will allow 512K writes
 2019-07-20 10:47:24 +02:00
Philippe Teuwen 8e6258936c make style 2019-07-19 13:18:35 +02:00
Philippe Teuwen 33f2cb0981 Rework flasher exit on error 2019-07-19 13:15:32 +02:00
Philippe Teuwen f6f14f82d4 Add option -i to flasher to query Pm3 for its memory size, and some doc tuning 2019-07-19 13:02:12 +02:00
Philippe Teuwen 44278272a4 typo 2019-07-19 12:39:23 +02:00
slurdge 7bf3255a6c Flasher support for 512K flash 
A better way would be to cut the connecting function and flashing function and to move the whole mem computation to flash.c
Working flasher
 2019-07-19 12:35:04 +02:00
Philippe Teuwen 4e9e7d6da0 temporary fix to get Appveyor happy. Will need more tuning later. 2019-07-18 23:50:45 +02:00
Julien Piat 29f8bfb80c Update default_keys.dic with new keys from Scan Badge APK 2019-07-18 15:54:21 +02:00
Philippe Teuwen 259c730bb0 exit(EXIT_FAILURE) if a port was specified to the client and no pm3 is usable 2019-07-17 20:15:47 +02:00
merlokk 84022807a8 fix rare emv search behavior 2019-07-17 12:20:04 +03:00
merlokk a6977860db fix emv search keep field bug 2019-07-17 11:27:05 +03:00
Oleg Moiseenko d3b6a8e193
Merge pull request #253 from merlokk/emv_apdu 
Emv apdu
 2019-07-16 18:08:39 +03:00
merlokk 638d698445 make style 2019-07-16 18:05:36 +03:00
merlokk 5fd2a7613f add check 2019-07-16 18:05:23 +03:00
merlokk e61a65fbe8 check PPSE instead of PSE and vice versa. I have one card with this strange behavior... 2019-07-16 17:15:32 +03:00
merlokk a30c62137b use apduencode for emv commands 2019-07-16 17:04:54 +03:00
merlokk bd8824a2f3 make style 2019-07-16 16:10:11 +03:00
merlokk 7726ec6000 move sAPDU 2019-07-16 16:05:47 +03:00
Philippe Teuwen ed4289d462
Merge pull request #251 from merlokk/reorg_includes 
added PACKED attribute for structures and reorganize include folder
 2019-07-16 14:52:14 +02:00
merlokk 12c6b5cb20 add the definition of PACKED in its client/deprecated-hid-flasher/flasher/proxmark3.h 2019-07-16 15:25:48 +03:00
merlokk 20d13d5509 added PACKED attribute for structures and reorganize include folder 2019-07-16 14:50:38 +03:00
Philippe Teuwen d8763509de Add 'hw standalone' to jump to standalone mode from command line or script 2019-07-15 22:31:19 +02:00
Oleg Moiseenko ddd4601c1e
Merge branch 'master' into ext_apdu 2019-07-15 19:25:48 +03:00
merlokk 84c09ce881 added define PACKED 2019-07-15 19:21:19 +03:00
merlokk d2a2acf69c make style 2019-07-15 19:12:01 +03:00
merlokk df1dd71d14 apdu format and print works 2019-07-15 17:26:42 +03:00
Iceman caceea24a4
Update default_keys.dic 2019-07-15 15:36:12 +02:00
Philippe Teuwen 0ea7fa7784 buggy 'mem read' removed, 'mem save' renamed 'mem dump', can now display too 2019-07-15 12:57:20 +02:00
Philippe Teuwen 31c3a15cd4 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  textual
  Changelog for PR #245, #246
  chg: 'script run read_pwd_mem' - now can correctly deal with more than 4096 bytes when printing mifare classic keys
  Fix. More flexible anti-collision frame check
  hf_mf_sim. Really tags not respond NACK on invalid authentication
 2019-07-15 00:31:46 +02:00