RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-25 01:36:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
8689 commits 3 branches 14 tags 85 MiB
Commit graph

480 commits

Author SHA1 Message Date
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
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 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
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
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
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 7076df0e18 hf mf chk/fchk: don't stop on line errors when parsing dict 2019-08-26 13:53:23 +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
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
Matthias Konrath 87cbf3aa70 Improved the reliability, speed and redability. Ready for a pull mr. iceman ;) 2019-08-23 17:17:17 +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
Iceman a0f261c1e0 chg: moved fileutils from loclass 2019-08-21 14:41:33 +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
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
Philippe Teuwen a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
Philippe Teuwen f276dca3f1 less hardcoded sizes and more ARRAYLEN 2019-07-31 23:45:17 +02:00
Philippe Teuwen 9beabaabf5 make style 2019-07-23 21:33:52 +02:00
cjbrigato 5c3676ad81 ADD: Early SPIFFS implementation see #257, UPDATE HF_COLIN accordingly 2019-07-22 22:56:06 +02:00
Philippe Teuwen 4e9e7d6da0 temporary fix to get Appveyor happy. Will need more tuning later. 2019-07-18 23:50:45 +02:00
Philippe Teuwen 55602bf833 Fix few zelaous WARNING->ERR 2019-07-14 12:17:34 +02:00
Philippe Teuwen 8bf4b4ad97 Promote WARNING to ERR on some error msgs 2019-07-14 00:35:18 +02:00
Eloff 735077f358 Does clear trace log only at first call 'hf mf chk', to save whole process history 2019-07-13 18:26:52 +03:00
Philippe Teuwen 844d732297 Replace ukbhit by kbd_enter_pressed, not requiring tcgetattr: 
Note that it behaves differently now
* it looks for Enter key only, not any key
* it "eats" the input, no need for (void)getchar() after it
* it works the same no matter the value of ICANON
* the mingw version has been adapted to act the similarly

This should fix its usage on Android where tcgetattr always returns -1
 2019-07-11 13:01:34 +02:00
Philippe Teuwen a55e597e36 make style 2019-06-07 21:40:33 +02:00
Philippe Teuwen 732bc766f9 Reduce some var scopes 2019-06-07 18:41:39 +02:00
Philippe Teuwen 1a39ec3026 hf mf/mfu dbg => hw dbg 2019-06-06 11:31:47 +02:00
iceman1001 ecc62add26 fix return check 2019-05-31 14:07:07 -04:00
iceman1001 d2fb18f648 chg: 'hf mf dump' - remove debug statements 2019-05-29 08:55:12 +02:00
iceman1001 cee2fc7a34 hf mf rdbl - uses NG 2019-05-28 13:20:56 -04:00
iceman1001 548d6429ed return codes 2019-05-27 09:15:53 -04:00
iceman1001 53f2058c7a chf: hf mf eget\nhf mf eset\nhf mf eclr - uses NG 2019-05-27 07:46:27 -04:00
iceman1001 b05796c7c4 chg: hf mf dbg\nchg: hf mf sim\nchg: hf 14a sim - uses NG 2019-05-26 13:42:27 -04:00
Albert Einstein de694d7cca modified help in fchk and chk 2019-05-23 21:04:48 +02:00
iceman1001 65ff4f0e92 chg: hf mf setmod - uses NG 2019-05-15 06:52:22 -04:00
Philippe Teuwen 962f45e3e6 mf nested: remove compilation warning 2019-05-08 22:02:14 +02:00
Philippe Teuwen 77398550b0 fast mode on Mifare emulator upload 2019-05-08 21:54:15 +02:00
Philippe Teuwen 2f1061f95b rework ping 2019-05-07 23:35:09 +02:00
Philippe Teuwen 290f2b625b Automated upgrades SendCommandOLD/MIX 0,0,0,NULL,0 -> NG and SendCommandOLD ....,NULL,0 -> MIX 2019-05-07 19:51:33 +02:00
iceman1001 39272ba1fb convert sendOLD -> MIX for simple cmds 2019-05-07 19:13:14 +02:00
iceman1001 0cedfc7b2b chg: list should always be available, since we can now load / save trace files. 2019-05-02 10:42:02 +02:00
Philippe Teuwen f217b47cbd style 2019-05-02 00:18:20 +02:00
Philippe Teuwen e6135a8f78 Replace WITH_ISO14443a by dynamic detection in client 2019-05-01 23:38:57 +02:00
Philippe Teuwen cad676a23c Replace WITH_FLASH by dynamic detection in client 2019-05-01 21:46:29 +02:00
Philippe Teuwen ca43afa19b begin of dynamic capabilities handling in client 2019-05-01 20:48:15 +02:00
iceman1001 ec5f70caf2 easier to read 2019-05-01 15:15:48 +02:00
Philippe Teuwen 645a4e9d1d generalize KEYS_IN_BLOCK usage 2019-05-01 14:55:14 +02:00
iceman1001 b7e3806eff chg: 'hf mf chk' - let eload part benefit for fast push mode 
chg: 'script run mfkeys' -  corrected to use NG frames correct
 2019-05-01 13:15:51 +02:00
Philippe Teuwen 13b2e6eed7 Fix hf mf chk 2019-05-01 12:19:51 +02:00
Philippe Teuwen 27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
iceman1001 c1445d2a31 CHG: 'hf mf chk' - uses NG 2019-04-30 14:01:23 +02:00
Philippe Teuwen 35ea8e745e Faster CmdHF14AMfChk 2019-04-29 22:39:42 +02:00
Philippe Teuwen f1deb865db Merge branch 'master' into experimental_varlen 
* master:
  ltrim cmd before display
  hf mf eload: fix absence of filename
  detect wrong numOfBlocks / numOfSectors arguments
  safeFile*: accept when suffix is already provided
  loadFile*: accept when suffix is already provided
  textual,  to reflect which repo.
  LoadEML: don't complain on the last \n
 2019-04-28 22:53:12 +02:00
Philippe Teuwen 334e6d208b hf mf eload: fix absence of filename 2019-04-28 22:16:50 +02:00
Philippe Teuwen 997f5d700e detect wrong numOfBlocks / numOfSectors arguments 2019-04-28 21:34:05 +02:00
Philippe Teuwen 1dbcb712c3 safeFile*: accept when suffix is already provided 2019-04-28 20:42:57 +02:00
Philippe Teuwen 405f24522e loadFile*: accept when suffix is already provided 2019-04-28 19:21:04 +02:00
iceman1001 9779868753 style 2019-04-28 11:09:46 +02:00
Philippe Teuwen eababdd3ef Merge branch 'master' into experimental_varlen 
* master:
  chg: 'hf mf sim' - textual
  fix:  warning on mingw64.   This offset is calculated, casting it to u32 should be fine.
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all offending code,  return 1.   Will only impact the speed of hardnested execution.
  fix again OSX
  fix https://github.com/RfidResearchGroup/proxmark3/issues/173
  used predefined constants, common types moved to common header files
  backward compatibility, on load converter for old mfu dump format
  loops for counters output
  UL/NTAG new dump file format. Added counters support, simulation
 2019-04-25 20:05:04 +02:00
iceman1001 ef95d8c742 chg: 'hf mf sim' - textual 2019-04-25 16:57:18 +02:00
Iceman f227041932
Merge pull request #172 from McEloff/hfmfu 
UL/NTAG new dump file format. Added counters support, simulation
 2019-04-25 16:10:03 +02:00
Eloff a8c1fa7a3b backward compatibility, on load converter for old mfu dump format 2019-04-23 17:07:20 +03:00
Philippe Teuwen 9602e641e2 Merge branch 'master' into experimental_varlen 
* master:
  translation
  document offsets
  textual
  textual
  typo
  'hf mf sim' full-byte anti-collision frame support
 2019-04-22 21:39:38 +02:00
iceman1001 166da51360 textual 2019-04-22 19:21:07 +02:00
Philippe Teuwen c4766b2649 Semi-Automated SendCommand -> SendCommandOLD 2019-04-19 23:01:13 +02:00
Philippe Teuwen 1b6a45ac17 propagate CmdsParse return value 2019-04-19 00:47:51 +02:00
Eloff 960b21793c 'hf mf sim' full-byte anti-collision frame support 2019-04-18 21:02:48 +03:00
Philippe Teuwen 482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen 533667ea6d Better Reply structs 2019-04-17 23:44:48 +02:00
Philippe Teuwen 7cbcf8163c Merge branch 'master' into experimental_varlen 
* master: (27 commits)
  textual
  style redundant assignment
  timeout fix
  small fix
  add termcap
  add readline and small fix
  rdp
  textual
  null term?
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/166
  add dlls to release
  style
  style
  test fix
  test fixes
  another fix
  fix memleak
  fix
  textual
  use printandlogex
  ...
 2019-04-17 22:06:39 +02:00
Philippe Teuwen be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001 587d826f84 textual 2019-04-17 20:36:10 +02:00
Eloff 63f9f11066 'hf mf sim' bugs fix, RATS support, etc 2019-04-16 23:52:05 +03:00
iceman1001 436910605b unified Proxmark3 text 2019-04-16 20:00:25 +02:00
iceman1001 74ece72b26 textual 2019-04-16 17:21:42 +02:00
iceman1001 7b30126371 style 2019-04-16 15:29:18 +02:00
Philippe Teuwen 5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
Philippe Teuwen 05374fce07 Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes] 2019-04-12 19:41:56 +02:00
iceman1001 a872f04c1e textual 2019-04-11 17:19:48 +02:00
Philippe Teuwen 0ab6de64d4 structs: initializes explicitely all fields, so we can detect when we really forgot one [-Wmissing-field-initializers] 2019-04-10 13:59:00 +02:00