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

4007 commits

Author SHA1 Message Date
Philippe Teuwen 62cf4ad8a7 fancy INPLACE 2019-05-14 12:35:25 +02:00
iceman1001 48c71aeef6 fix: 'script run legic' - also save as binary. https://github.com/RfidResearchGroup/proxmark3/issues/193 
if binary file exists,  it will try to increase filename counter to find a non-existing name.
 2019-05-14 11:54:25 +02:00
iceman1001 28398222e6 chg: 'hf tune' - now with prefix :) 2019-05-14 11:18:33 +02:00
Iceman d4eb91fa43
Merge pull request #195 from mcd1992/guikeys 
Added paged moving to the plot GUI
 2019-05-14 11:18:00 +02:00
Philippe Teuwen d535d5a378 hf tune: can be interrupted by keyboard 2019-05-14 08:40:22 +02:00
Philippe Teuwen 42d025d01a Slight rework of hw tune 2019-05-14 08:29:24 +02:00
Philippe Teuwen c281f71f59 hf tune: group commands 2019-05-14 08:25:26 +02:00
mcd1992 528da6ec32 Added paged moving to the plot GUI 2019-05-13 19:39:27 -05:00
Philippe Teuwen 7ed7a9de40 Rework hf tune to make it synchronous (needed for rdv4) 2019-05-14 00:37:03 +02:00
Philippe Teuwen 995d782bb0 CMD_READER_HITAG requires always a hitag_data struct 
used as SendCommandMIX(CMD_READER_HITAG, RHT2F_UID_ONLY, 0, 0, NULL, 0);
sent to ReaderHitag((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes);
void ReaderHitag(hitag_function htf, hitag_data *htd)
=> we should always send a hitag_data struct
 2019-05-13 23:15:07 +02:00
Philippe Teuwen ff7cd9d84d CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES needs 6 bytes of data. 
used as SendCommandMIX(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
sent to MifareAcquireEncryptedNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
  [...]
  uint64_t ui64Key = bytes_to_num(datain, 6);

=> we should always send 6 bytes for "bytes_to_num"
 2019-05-13 23:11:05 +02:00
Philippe Teuwen e4f00c52da Fix #194 Graph window loops to end if you scroll left past 0 2019-05-13 20:34:02 +02:00
iceman1001 6a6902e57d chg: luascripts now uses t55xx write NG frame format 2019-05-13 16:51:26 +02:00
iceman1001 801cb95967 fix: 'lf t55xx write' - wrong bitshift 2019-05-13 13:36:54 +02:00
iceman1001 d2a4ade2af chg: lf t55xx write - now uses NG frames. 2019-05-13 13:23:53 +02:00
Philippe Teuwen 0e827b1083 Fix CMD_T55XX_WRITE_BLOCK expecting data and sending NULL 2019-05-13 12:21:09 +02:00
Philippe Teuwen 6caf571a44 NG->MIX for hitag cmds where the zeroes were actual args 2019-05-13 10:35:30 +02:00
Philippe Teuwen 4929b16bf9 style 2019-05-12 20:38:03 +02:00
Philippe Teuwen a2c70e5481 Add .dic to gitattributes for LF, remove existing CR 2019-05-12 20:37:51 +02:00
Chris 41db59f028 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-12 18:45:13 +02:00
Chris d44a5712a7 add: default key for library / parking 2019-05-12 18:43:20 +02:00
Philippe Teuwen 80a71c59d4
Merge pull request #186 from uhei/hexdump 
Cmdtrace: Show trace ouput in hexdump format
 2019-05-10 19:27:45 +02:00
Philippe Teuwen b6b20e246c
Merge pull request #187 from uhei/macos-readline 
client/Makefile: use brew libreadline on macOS
 2019-05-10 19:07:03 +02:00
Philippe Teuwen 3412e9d8c5 Capabilities versionning, would also detect platform struct pack issues 2019-05-10 19:00:18 +02:00
Philippe Teuwen 5aed3e04c9
Merge pull request #190 from uhei/memcpy-bo 
client/comms.c: fix buffer overflow
 2019-05-10 18:47:39 +02:00
Uli Heilmeier a1c24c6c7d Cmdtrace: Show trace ouput in hexdump format 
Adding option 'x' to show trace output for 14a in hexdump format.
This output can be imported into Wireshark using the 'Import from Hex Dump' option.
Encapsulation type should be set to 'ISO 14443' and Max Frame Length to 256.

Format defined at https://www.kaiser.cx/pcap-iso14443.html
 2019-05-10 16:03:39 +02:00
Uli Heilmeier 0119e13ff3 client/comms.c: fix buffer overflow 
Don't copy more bytes into pm3_capabilities as its size.

Fix: RfidResearchGroup/proxmark3#189
 2019-05-10 14:50:09 +02:00
Uli Heilmeier 94b782ee10 client/Makefile: use brew libreadline on macOS 
Make sure we use libreadline from brew and not the default macOS shipped one.
Otherwise compilation fails for undefined rl_event_hook
 2019-05-10 12:24:38 +02:00
Philippe Teuwen 39c7941930 style 2019-05-09 20:20:54 +02:00
Philippe Teuwen 2bee7e12f6 Fix hf mfu dump on ULC: UID in filename 2019-05-09 20:05:12 +02:00
Philippe Teuwen 7195ce9b27 remove iso15 getUID timeout msg 2019-05-09 13:25:14 +02:00
Philippe Teuwen 730927a81d NG->MIX for few cmds where the zeroes were actual args 
CMD_READER_ISO_14443a
CMD_EPA_PACE_REPLAY
CMD_TEST_HITAGS_TRACES
CMD_FELICA_COMMAND
 2019-05-09 12:33:17 +02:00
Philippe Teuwen 84f696451d units 2019-05-09 01:07:34 +02:00
Philippe Teuwen 2c10482279 all LF sim: client waits till button pressed 2019-05-09 00:08:59 +02:00
Philippe Teuwen ddd62e2848 text 2019-05-08 22:45:20 +02:00
Philippe Teuwen d088ed4232 fast mode on LF techs using t55xx write block 2019-05-08 22:43:35 +02: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 c72e74275d fast mode on epa pace replay 2019-05-08 20:13:07 +02:00
Philippe Teuwen e7362d5e6a fast mode on legic cmds 2019-05-08 19:48:53 +02:00
Philippe Teuwen 93171e3d74 fast mode on sc upgrade, no much diff 2019-05-08 19:34:11 +02:00
Philippe Teuwen 2f71d951e1 iclass: avoid last ping in fast modes 2019-05-08 19:16:37 +02:00
Philippe Teuwen 2f2796be7e Fix deprecated-hid-flasher 2019-05-08 13:32:17 +02:00
Philippe Teuwen 4fd520c6d4 Introduce SendCommandBL 2019-05-08 13:31:58 +02:00
Philippe Teuwen e93b4e3c61 Remove usb_cmd refs 2019-05-08 11:17:14 +02:00
Philippe Teuwen c190ac0955 Hide conn error when hw reset, as suggested by @iceman 2019-05-08 11:14:29 +02:00
Philippe Teuwen 68e5b3c355 style 2019-05-08 01:35:51 +02:00
Philippe Teuwen f49d7e6d39 remove SendCommand 2019-05-08 01:32:32 +02:00
Philippe Teuwen c867b3bc9a Add cmd: usart btpin to change add-on BT PIN 2019-05-08 01:24:46 +02:00
Philippe Teuwen df2203d9c3 hw command text 2019-05-08 00:58:36 +02:00
iceman1001 964006fd21 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-08 00:17:52 +02:00
iceman1001 01efa71e27 use NG 2019-05-08 00:10:03 +02:00
iceman1001 8ebd5e0579 textual, fixes to legic commands used. Needs testing 2019-05-08 00:07:20 +02:00
Philippe Teuwen 02ea378e38 Wow, two improbable bugs were cancelling each other 2019-05-08 00:02:08 +02:00
iceman1001 5b087a053c fix: script run legic_buffer2card - correct params for write command 2019-05-07 23:53:06 +02:00
iceman1001 a5f19cde79 textual 2019-05-07 23:46:37 +02:00
iceman1001 81feb56003 text 2019-05-07 23:44:46 +02:00
iceman1001 8548eda9bd Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-07 23:41:56 +02:00
iceman1001 d313804e78 textual 2019-05-07 23:41:41 +02:00
Philippe Teuwen 920affeb44 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  textual
  textual
 2019-05-07 23:39:47 +02:00
Philippe Teuwen c505a59e3d Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  refactor NG
  refactor
  textual
  refactored NG
  textual
  refactoring NG
  refactoring
  15 - use NG and refactoring
  textual
  using MIX
  textual
  textual
  textual
  Update .gitignore
  chg: script run didump - helptexts
  fix:  rename to match the new file
  chg: script run didump - use MIX
  chg: hw ping - shouldnt be converted yet..
 2019-05-07 23:38:28 +02:00
iceman1001 9c95a2e8aa textual 2019-05-07 23:37:15 +02:00
Philippe Teuwen 2f1061f95b rework ping 2019-05-07 23:35:09 +02:00
iceman1001 89e25a4d1d textual 2019-05-07 23:34:05 +02:00
iceman1001 a59f2a1b60 refactor NG 2019-05-07 23:27:16 +02:00
iceman1001 e1bb05b35e refactor 2019-05-07 23:21:56 +02:00
iceman1001 7ccff2db4a textual 2019-05-07 23:19:22 +02:00
iceman1001 e799717880 refactored NG 2019-05-07 23:12:58 +02:00
iceman1001 6b472f6c56 textual 2019-05-07 23:04:29 +02:00
iceman1001 3c533db308 refactoring NG 2019-05-07 22:59:29 +02:00
iceman1001 9bf961cb8a refactoring 2019-05-07 22:48:18 +02:00
iceman1001 6fbd45aaed 15 - use NG and refactoring 2019-05-07 22:46:00 +02:00
iceman1001 b52a4a53b0 textual 2019-05-07 22:33:51 +02:00
iceman1001 b73146533a using MIX 2019-05-07 22:33:26 +02:00
iceman1001 c81bce6bf2 textual 2019-05-07 22:15:26 +02:00
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