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

3932 commits

Author SHA1 Message Date
iceman1001 2af7255f62 textual 2019-05-07 22:12:18 +02:00
iceman1001 75325aef86 textual 2019-05-07 22:08:46 +02:00
iceman1001 07b6535f7e chg: script run didump - helptexts 2019-05-07 22:03:11 +02:00
iceman1001 c99845b3d1 fix: rename to match the new file 2019-05-07 21:56:05 +02:00
iceman1001 df555be792 chg: script run didump - use MIX 2019-05-07 21:49:45 +02:00
iceman1001 c180c8df20 chg: hw ping - shouldnt be converted yet.. 2019-05-07 21:35:22 +02:00
Philippe Teuwen bf0ab55833 text 2019-05-07 20:47:05 +02:00
Philippe Teuwen 532dbf28a1 let OpenPm be responsible of setting session.pm3_present 2019-05-07 20:37:23 +02:00
Philippe Teuwen 061321c353 flash still need old cmds 2019-05-07 20:13:01 +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 0c20c1a9d1 convert to MIX for simple send commands. 2019-05-07 19:03:25 +02:00
iceman1001 119b1e7c81 chg: mem commands - sendMIX 2019-05-07 18:50:45 +02:00
iceman1001 cb991b4d2c make sure CloseProxmark sets pm3_present. 2019-05-07 17:31:07 +02:00
iceman1001 7eb7685559 cleaning up, simplify 2019-05-07 15:57:22 +02:00
iceman1001 f2a954b422 chg: save serial port name as copy. 2019-05-07 15:40:01 +02:00
iceman1001 43db2a50e2 cleaning 2019-05-07 14:48:53 +02:00
iceman1001 f60977695a cleaning up 2019-05-07 14:41:20 +02:00
iceman1001 b91e21edde better output from setting prompt, cursor is still inside ... 2019-05-07 12:29:26 +02:00
iceman1001 f85280ad41 fix: 'hw connect' - if pm3 client was in offline more to start with, check.. 2019-05-07 12:28:17 +02:00
Philippe Teuwen a20392edf3 change offline prompt asap 2019-05-07 12:18:51 +02:00
Philippe Teuwen de54d35d5f unplug detection 2019-05-07 12:11:36 +02:00
iceman1001 f68a398e42 rename 2019-05-07 11:46:12 +02:00
iceman1001 bb19e42bbd textual 2019-05-07 11:44:29 +02:00
iceman1001 fb7445a027 chg: 'hw connect' - make port optional. Reused previous serial port 2019-05-07 11:42:36 +02:00
iceman1001 61d250a7f8 add: 'hw connect' - lets you connect to a specified serial port. If already connected, it disconnects current port before. 2019-05-07 11:05:05 +02:00
Philippe Teuwen 1c70163605 reconnect fast 2019-05-07 01:06:01 +02:00
Philippe Teuwen ec5876ba35 Linux: Detect soon when pm3 is unplugged 2019-05-06 23:25:01 +02:00
iceman1001 fa8bd85016 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-06 22:42:01 +02:00
iceman1001 29a160c905 reconnect version2 yolo 2019-05-06 22:41:00 +02:00
iceman1001 52396e8b5a textual 2019-05-06 22:40:06 +02:00
Philippe Teuwen c6b8c0c472 manual Makefile style (as some tabs need to be preserved) 2019-05-06 20:45:59 +02:00
iceman1001 dd82c42588 fix #185 - Only -mno-ms-bitfields on MINGW (@doegox) 2019-05-06 15:37:40 +02:00
iceman1001 3a902a7a4c chg: add some helptexts 2019-05-06 14:38:56 +02:00
iceman1001 cffd14a96b chg: reconnect to a disconnected proxmark3 device without restarting the client. Old functionality restored :) 
chg: renamed thread
chg: easier if-statements for USART
 2019-05-06 14:11:23 +02:00
Philippe Teuwen eb7aa033ff Add fast mode support for RX NG frames 2019-05-05 22:34:22 +02:00
Philippe Teuwen 65bd945b54 style 2019-05-05 22:04:35 +02:00
iceman1001 71c37dcb04 alphabet order 2019-05-05 18:42:09 +02:00
Philippe Teuwen 6b5a0f8319 Rename and unguard CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K ans it's used more generally than LF 2019-05-04 23:56:59 +02:00
Philippe Teuwen ed1ff3db7e forgot 2 files in the merge :( my bad 2019-05-04 11:33:48 +02:00
Philippe Teuwen 1cff822f1e remove warning 2019-05-03 22:37:04 +02:00
Philippe Teuwen 3176684f4a Add usart dev cmds & dynamic flash support capability 2019-05-03 22:30:17 +02:00
iceman1001 8e2d5370f9 fix: seems the mutex messed up on ubuntu but there it works without. 2019-05-03 21:58:47 +02:00
iceman1001 a49ae2d0ce FIX: slow reconfigure on mingw of serial port 2019-05-03 21:33:00 +02:00
iceman1001 ed1950a0f5 fix: cross thread communictions of timeout variable 2019-05-03 17:53:32 +02:00
iceman1001 535559a140 textual 2019-05-03 11:25:55 +02:00
iceman1001 cb34e554fe chg: info log = yellow 2019-05-03 09:41:28 +02:00
Philippe Teuwen b723126deb Make smartcard support detection dynamic 2019-05-03 09:04:28 +02:00
Philippe Teuwen f33d0bf206 hw tune: block client till button pressed 2019-05-03 08:40:21 +02:00
Philippe Teuwen 2ec05efa3a remove outdated & unused loclass files 2019-05-02 12:24:00 +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 4e17b17343 remove snooper.c, outdated and we can do the same with pm3 client 2019-05-02 00:40:00 +02:00
Philippe Teuwen e286b3091d remove cli.c, outdated and we can do the same with pm3 client 2019-05-02 00:34:55 +02:00
Philippe Teuwen 59cc7b46d4 emv: dynamic detection in client 2019-05-02 00:23:58 +02:00
Philippe Teuwen f217b47cbd style 2019-05-02 00:18:20 +02:00
Philippe Teuwen 32bb9511ec Replace WITH_LF by dynamic detection in client 2019-05-02 00:02:38 +02:00
Philippe Teuwen e6135a8f78 Replace WITH_ISO14443a by dynamic detection in client 2019-05-01 23:38:57 +02:00
Philippe Teuwen d7b53aacee Replace WITH_HITAG by dynamic detection in client 2019-05-01 23:26:06 +02:00
Philippe Teuwen 78fdffddf7 Replace WITH_ICLASS by dynamic detection in client 2019-05-01 23:20:18 +02:00
Philippe Teuwen c640c63e51 Replace WITH_FELICA by dynamic detection in client 2019-05-01 23:18:21 +02:00
Philippe Teuwen 745bff4143 Replace WITH_ISO14443b by dynamic detection in client 2019-05-01 23:17:14 +02:00
Philippe Teuwen 858def687a Replace WITH_LEGIC by dynamic detection in client 2019-05-01 23:14:30 +02:00
Philippe Teuwen 582d948ac2 Replace WITH_ISO15693 by dynamic detection in client 2019-05-01 23:04:50 +02:00
Philippe Teuwen 2d99c6096b fix IfPm3Fpc call 2019-05-01 23:04:20 +02:00
Philippe Teuwen 30d29434d5 Replace WITH_FPC by dynamic detection in client 2019-05-01 22:56:10 +02:00
Philippe Teuwen bb966caab1 Replace WITH_LCD by dynamic detection in client 2019-05-01 22:47:21 +02:00
Philippe Teuwen a79c792d9f Fix smartcard commands visibility 2019-05-01 22:37:47 +02:00
Philippe Teuwen 6b2677c154 Replace WITH_SMARTCARD by dynamic detection in client 2019-05-01 22:33:27 +02:00
Philippe Teuwen cad676a23c Replace WITH_FLASH by dynamic detection in client 2019-05-01 21:46:29 +02:00
Uli Heilmeier 52179146b6 cmdparser: fix copy& paste typo 2019-05-01 21:31:34 +02:00
Philippe Teuwen 10489db97d capabilities: more IsAvailable helpers 2019-05-01 21:09:23 +02:00
Philippe Teuwen ca43afa19b begin of dynamic capabilities handling in client 2019-05-01 20:48:15 +02:00
iceman1001 5a6929c533 chg: lua lib 14a, added disconnect support 2019-05-01 18:26:12 +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
iceman1001 5ab9716e77 textual 2019-05-01 06:04:33 +02:00
iceman1001 63d67e2b0f fix: setting pm3_present in flasher. 2019-05-01 05:48:20 +02:00
Philippe Teuwen 4f11ef048f style 2019-05-01 01:38:52 +02:00
Philippe Teuwen 820a6d99a9 better offline mode 2019-04-30 23:52:40 +02:00
iceman1001 f8f39d6196 fix: passing a struct. 2019-04-30 22:03:20 +02:00
iceman1001 e6315b88a1 missing 2019-04-30 21:55:43 +02:00
Philippe Teuwen 63cd4a9fbb Merge branch 'better_color_handling' 
* better_color_handling:
  Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed
  Use PrintAndLogEx in flasher
  Simplify color & banner logic
  Smart color handling:
 2019-04-30 21:37:19 +02:00
Philippe Teuwen 27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
Philippe Teuwen a5d05e8d42 Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed 2019-04-30 20:23:22 +02:00
Philippe Teuwen 5c9c38ff71 Use PrintAndLogEx in flasher 2019-04-30 20:19:29 +02:00
iceman1001 cddc25994c fix: by reference 2019-04-30 16:16:17 +02:00
iceman1001 6cddaa0a08 fix: 'hf mf keybrute' - adapt to NG for checkkeys. Kind of out-of-datem, since hardnested solves this better. 2019-04-30 14:29:52 +02:00
iceman1001 2dea3684ae fix: 'hf iclass eload' - enable NG (Thanks @doegox) 
chg: 'hf iclass chk' - now uses fast push mode
 2019-04-30 14:19:26 +02:00
iceman1001 c1445d2a31 CHG: 'hf mf chk' - uses NG 2019-04-30 14:01:23 +02:00
iceman1001 937d839c6a chg: 'script run mfkeys' - use fast push mode. 2019-04-30 13:27:19 +02:00
Philippe Teuwen 0a4b90ac20 Simplify color & banner logic 2019-04-30 13:02:27 +02:00
iceman1001 e1063e2836 chg: reconfigure uart timeouts when compiled for FPC and connecting over USB. 2019-04-30 12:57:44 +02:00
iceman1001 481d70b0da chg: 'hf iclass eload' - use fast push mode. 2019-04-30 12:14:46 +02:00
iceman1001 918a46a984 uninit. 2019-04-30 12:12:55 +02:00
iceman1001 10ac5fd256 chg: 'lf sim' - now uses fast push mode 2019-04-30 10:10:25 +02:00
iceman1001 0ee710ed92 chg: lua scripts now get easy access to fast_push_mode option 2019-04-30 09:48:08 +02:00
Philippe Teuwen a91d0a7b19 Smart color handling: 
* if on Windows, no color, as usual
* if on Linux, color only on real term
  * no color when > foo
  * no color in the logfile
 2019-04-30 00:41:52 +02:00
Philippe Teuwen f4d62eec09 Fix COMMS_DEBUG_RAW 2019-04-29 23:02:49 +02:00
Philippe Teuwen 56f92348ea style 2019-04-29 22:41:28 +02:00
Philippe Teuwen 73b6fa7cbc Simpler newfilenamemcopy 2019-04-29 22:40:10 +02:00
Philippe Teuwen 35ea8e745e Faster CmdHF14AMfChk 2019-04-29 22:39:42 +02:00
Philippe Teuwen 32a512b13e Support break_after_ACK for MIX frames 2019-04-29 22:39:18 +02:00
Philippe Teuwen ac9f3b29f6 better COMMS_DEBUG_RAW 2019-04-29 22:38:54 +02:00
Philippe Teuwen fc6be9fea4 Define USB_CMD_DATA_SIZE_MIX 2019-04-29 22:38:26 +02:00
iceman1001 b08b1c2cd9 chg: 'hf mfu info' - ndef parsing was a bit wrong 2019-04-29 18:58:27 +02:00
iceman1001 31a531f1d0 chg: better ndef parsing and texts 2019-04-29 17:34:47 +02:00
iceman1001 9e34a8e56d chg: 'hf mfu info' - ndef has 4 byte blocks on UL/NTAG 2019-04-29 17:34:24 +02:00
iceman1001 60ea44069e text 2019-04-29 14:57:05 +02:00
iceman1001 c4e4e7dc69 text 2019-04-29 14:55:39 +02:00
iceman1001 50f5b1b422 intial 2019-04-29 14:49:18 +02:00
iceman1001 f4f61fecd6 chg: 'script run ndef_dump' - optional verbose ndefparsing 2019-04-29 14:47:44 +02:00
iceman1001 ea7ad8cbc6 fixes to ndef 2019-04-29 14:44:08 +02:00
iceman1001 f4b75d7f5b fix: ndef parse uri off by one 2019-04-29 14:42:37 +02:00
iceman1001 67e3ac3f54 add: ndef parsing to LUA 2019-04-29 14:19:41 +02:00
iceman1001 03d6454d95 chg: 'script run mfkeys' : uses NG 
chg: 'hf mf chk' : uses old/mix
 2019-04-29 12:12:14 +02:00
iceman1001 7454a4dcf2 chg: 'hf mf chkkeys' - now uses NG 2019-04-29 02:07:40 +02:00
iceman1001 7cc6975e52 fix 2019-04-29 01:52:55 +02:00
iceman1001 2b561ad732 next 2019-04-29 01:51:00 +02:00
iceman1001 47fbb557b4 next 2019-04-29 01:39:40 +02:00
iceman1001 b254e70160 next 2019-04-29 01:32:45 +02:00
Philippe Teuwen 5e8fc73527 Debug hexdumps of comm 2019-04-29 01:20:03 +02:00
iceman1001 805b679b2f fxing 2019-04-28 23:58:51 +02:00
iceman1001 a6ee9ef3e7 Merge branch 'experimental_varlen' of https://github.com/RfidResearchGroup/proxmark3 into experimental_varlen 
# Conflicts:
#	client/scripts/ndef_dump.lua
 2019-04-28 23:57:31 +02:00
iceman1001 9d512d411c chg: added manufacturer to 14ainfo structure. 
chg: ndefdump remakes
 2019-04-28 23:43:55 +02:00
Philippe Teuwen 69f8d81f4e style 2019-04-28 22:54:00 +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 5bc9118a19 baudrate only for physical uart 2019-04-28 22:51:40 +02:00
Philippe Teuwen 281cdead26 ltrim cmd before display 2019-04-28 22:38:44 +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
iceman1001 cf0d17853e next 2019-04-28 21:29:47 +02:00
Philippe Teuwen 1dbcb712c3 safeFile*: accept when suffix is already provided 2019-04-28 20:42:57 +02:00
iceman1001 f4f8636b86 more converting scripts 2019-04-28 19:51:25 +02:00
iceman1001 79bfe892d6 next 2019-04-28 19:45:00 +02:00
iceman1001 25dd7c9a1c spelling 2019-04-28 19:39:09 +02:00
iceman1001 02c2ea5a15 chg: next batch of scripts 2019-04-28 19:26:26 +02:00
Philippe Teuwen 405f24522e loadFile*: accept when suffix is already provided 2019-04-28 19:21:04 +02:00
iceman1001 819896acf6 first batch of updated scripts to use sendMIX commands instead. 2019-04-28 18:46:06 +02:00
Philippe Teuwen c6172b4d9c LoadEML: don't complain on the last \n 2019-04-28 16:47:50 +02:00
iceman1001 195887487b fixes to commands.lua to support MIX/NG 2019-04-28 16:35:30 +02:00
iceman1001 292462fb74 fixes to sendMIX/SendNG 2019-04-28 16:31:49 +02:00
iceman1001 cc5b63823b chg: better sending 2019-04-28 12:52:25 +02:00
iceman1001 9779868753 style 2019-04-28 11:09:46 +02:00
iceman1001 abf93f4f2c Merge branch 'experimental_varlen' of https://github.com/RfidResearchGroup/proxmark3 into experimental_varlen 2019-04-28 11:05:51 +02:00
iceman1001 c13f9e7a0f add: SendCommandMIX, SendCommandOLD support in LUA 2019-04-28 11:05:23 +02:00
Philippe Teuwen fbec3f3125 Merge branch 'master' into experimental_varlen 
* master:
  fix segfault
  rework shell scripts for easy client or flasher
  Stop poking Internet when compiling
  doc multiple commands with -c
  Add support for: proxmark3 -c "hw ping;hw version;hw ping"
  update.sh flash boot only if option -b
 2019-04-27 16:55:28 +02:00
Philippe Teuwen 8ebc44ee81 fix segfault 2019-04-27 16:52:23 +02:00
iceman1001 c5c364d994 fix: compilation on mingw 2019-04-27 11:57:11 +02:00