RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-12-10 05:25:53 +08:00
Code Issues Projects Releases Packages Wiki Activity
6403 commits 3 branches 18 tags 91 MiB
Commit graph

4097 commits

Author SHA1 Message Date
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