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
5983 commits 3 branches 14 tags 85 MiB
Commit graph

3872 commits

Author SHA1 Message Date
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
iceman1001 238eda8b17 chg: 'hw detectreader' cleanup 2019-04-27 11:07:59 +02:00
Philippe Teuwen e2e0b704c5 Several changes in the initial connection, see details: 
* TestProxmark uses pingng
* New command CMD_CAPABILITIES to transmit capabilities from pm3 to host
* Use TestProxmark to retrieve capabilities with that new command
* CloseProxmark if TestProxmark fails
* Hide baudrate for USB and retrieve real baudrate from pm3 for BT
 2019-04-27 02:46:20 +02:00
Philippe Teuwen 7d1161d7d8 First packet is in TestProxmark, not pm3_version 2019-04-27 01:16:43 +02:00
Philippe Teuwen 12937884f6 move uart_speed to conn struct and display baudrate only for real UART 2019-04-27 01:15:52 +02:00
Philippe Teuwen 200290bc56 doc multiple commands with -c 2019-04-27 00:33:14 +02:00
Philippe Teuwen d3cc0bb71c Add support for: proxmark3 -c "hw ping;hw version;hw ping" 2019-04-27 00:31:05 +02:00
Philippe Teuwen e9bfc3eb7a Merge branch 'master' into experimental_varlen 
* master:
  rename usb_present
  TestProxmark only if OpenProxmark returned pm3 present
  Trying original SPI mode for 24MHz flash mem
  text
 2019-04-26 23:30:30 +02:00
Philippe Teuwen 897632a717 rename usb_present 2019-04-26 23:30:03 +02:00
Philippe Teuwen 4a576efc44 TestProxmark only if OpenProxmark returned pm3 present 2019-04-26 23:26:51 +02:00
Philippe Teuwen 3b6a249646 move global connection flags to cnn struct 2019-04-26 23:16:24 +02:00
Philippe Teuwen 01b31c742b Use block_after_ACK in flashmem too 2019-04-26 13:53:11 +02:00
Philippe Teuwen b12be75a5b Remove block_after_ACK mechanism on NG frames, flashing uses OLD and NG won't use ACK anymore 2019-04-26 12:02:34 +02:00
Philippe Teuwen a14b3d8b87 Merge branch 'master' into experimental_varlen 
* master:
  missing bracket
  text
  CHG: remove WITH_EMV since its not used at all.
 2019-04-26 10:54:12 +02:00
iceman1001 4ad9f57939 missing bracket 2019-04-26 10:49:30 +02:00
Philippe Teuwen 1c136c8fc6 Merge branch 'master' into experimental_varlen 
* master:
  rework Dbprintf & add color support
  use color macros
  doc magic
  archive and fix hid-flasher
  update standalone readme
 2019-04-26 10:48:28 +02:00
iceman1001 cf7e7d3447 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 10:36:26 +02:00
Philippe Teuwen cb452c98ba rework Dbprintf & add color support 2019-04-26 10:36:06 +02:00
iceman1001 88744650db Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 08:56:16 +02:00
Philippe Teuwen 70995f0f1e use color macros 2019-04-26 08:29:48 +02:00
iceman1001 de05d6e4d2 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 00:30:36 +02:00
Philippe Teuwen 7d6f971db4 archive and fix hid-flasher 2019-04-26 00:11:45 +02:00
Philippe Teuwen 540fecb760 Merge branch 'master' into experimental_varlen 
* master:
  adjust standalone doc
  Use placeholder for standalone mode if needed
  Move compile options to Makefile.hal
  textual
  chg: refactor standalone mode info string add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
 2019-04-25 23:01:49 +02:00
iceman1001 5c49fcbfdb CHG: remove WITH_EMV since its not used at all. 2019-04-25 22:51:01 +02:00
Philippe Teuwen f3b3508d3e Move compile options to Makefile.hal 2019-04-25 22:15:16 +02:00
Philippe Teuwen 0fc79824dd Merge branch 'master' into experimental_varlen 
* master:
  remove redundant def
  chg:  forgot to readd hitag support :)
  Guard Hitag code
 2019-04-25 20:59:27 +02:00
Philippe Teuwen a844afc273 Guard Hitag code 2019-04-25 20:42:41 +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 df96b58fcc style 2019-04-25 17:06:40 +02:00
iceman1001 ef95d8c742 chg: 'hf mf sim' - textual 2019-04-25 16:57:18 +02:00
iceman1001 5cc3a1b717 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-25 16:55:48 +02:00
iceman1001 3bfd01bffb fix: warning on mingw64. This offset is calculated, casting it to u32 should be fine. 2019-04-25 16:55:00 +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
iceman1001 fe35a972f5 fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 
remove all offending code,  return 1.   Will only impact the speed of hardnested execution.
 2019-04-25 16:08:08 +02:00
iceman1001 90463cb79f fix again OSX 2019-04-25 09:49:47 +02:00
iceman1001 ce8d5c66ab fix https://github.com/RfidResearchGroup/proxmark3/issues/173 
this seems to work for OSX,  and improved linux version with fallback.
 2019-04-25 08:29:15 +02:00
Philippe Teuwen 4b5800d78f remove name 2019-04-24 15:57:24 +02:00
Philippe Teuwen 517bf7e238 Merge branch 'master' into experimental_varlen 
* master:
  Force no-ms-bitfields to ensure proper struc packing on Windows
 2019-04-24 15:05:09 +02:00
Philippe Teuwen 1b246cd380 Force no-ms-bitfields to ensure proper struc packing on Windows 2019-04-24 15:04:43 +02:00
Philippe Teuwen 79d7fb65b5 Merge branch 'master' into experimental_varlen 
* master:
  Fix segfault when loading a file
  Revert c7a4d7af, remove redundant include
 2019-04-24 00:59:57 +02:00
Philippe Teuwen 25048ccf2f Fix segfault when loading a file 2019-04-24 00:53:25 +02:00
Philippe Teuwen e453aff88c First adjustments for FPC BT link 2019-04-23 23:36:36 +02:00
Eloff 66ee8dc09e used predefined constants, common types moved to common header files 2019-04-23 21:14:20 +03:00
Eloff a8c1fa7a3b backward compatibility, on load converter for old mfu dump format 2019-04-23 17:07:20 +03:00
Eloff 8793a9e596 Merge commit 'e171010d' into hfmfu 
# Conflicts:
#	CHANGELOG.md
 2019-04-22 23:26:20 +03:00
Eloff 4161779083 loops for counters output 2019-04-22 23:20:35 +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 458ce75073 textual 2019-04-22 19:21:55 +02:00
iceman1001 166da51360 textual 2019-04-22 19:21:07 +02:00
Philippe Teuwen d6892136ac Add communication_delay also to dl_it timeout 2019-04-22 02:44:06 +02:00
Philippe Teuwen 3e402797c1 dl_it uses also global start_time reset by packets reception as this can take ages (50s at 9600 baud for LF samples) 2019-04-22 02:11:46 +02:00
Philippe Teuwen eebea8c088 DbpStringEx using reply_ng 2019-04-22 01:33:32 +02:00
Philippe Teuwen 913c03d3c4 Reset WaitForResponse timeout every time we get a packet 
as cmds sending a lot of Dbprintf msgs can take ages on slow links
e.g. "hw status" on 9600 baud link takes 26.5s with "reply_old" Dbprintf
 2019-04-21 23:56:08 +02:00
Philippe Teuwen 75ee60f267 WaitForResponseTimeoutW: fix, no communication_delay when timeout=-1 2019-04-21 23:26:51 +02:00
Eloff db3103b531 UL/NTAG new dump file format. Added counters support, simulation 2019-04-21 03:18:00 +03:00
Philippe Teuwen 4aa1b49493 fix uart_posix: bytecound must be 32b 2019-04-21 01:05:02 +02:00
Philippe Teuwen 6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +02:00
Philippe Teuwen a7773b3395 Introduce reply_mix, to still get some varlen on old API 2019-04-20 03:17:19 +02:00
Philippe Teuwen 3bcf80bb34 Introduce SendCommandMIX, to still get some varlen on old API 2019-04-20 02:41:40 +02:00
Philippe Teuwen 95822d8360 minor 2019-04-20 01:49:37 +02:00
Philippe Teuwen 238fc10c9a style 2019-04-20 01:08:07 +02:00