RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-10-05 14:46:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
11371 commits 3 branches 14 tags 87 MiB
Commit graph

11371 commits

This Branch
This Branch
All Branches
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 d05cd5ff2b Internal packet structs don't need to be packed, only the wired structs 2019-05-13 22:32:44 +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 26f2fbfdbd Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-13 13:37:21 +02:00
iceman1001 801cb95967 fix: 'lf t55xx write' - wrong bitshift 2019-05-13 13:36:54 +02:00
Philippe Teuwen 1e345b1356 remove unused arg from MifareAcquireNonces 2019-05-13 13:31:24 +02:00
iceman1001 d2a4ade2af chg: lf t55xx write - now uses NG frames. 2019-05-13 13:23:53 +02:00
Philippe Teuwen 09afadc965 Remove unused args in some MF cmds 2019-05-13 12:49:41 +02:00
Philippe Teuwen 1edf4e1ef2 remove unused args in MifareEMemClr 2019-05-13 12:30:27 +02:00
Philippe Teuwen f85420d6f3 Remove unused oldarg in SniffHitag 2019-05-13 12:27:00 +02:00
Philippe Teuwen 20f7b2f3ec Remove support for old in MifareChkKeys, not needed anymore 2019-05-13 12:25:11 +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
iceman1001 afabd59995 FIX: leftover residue from sending different packages OLD/MIX/NG, is now cleaned before. 2019-05-13 09:39:43 +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 9322ce626e
Merge pull request #191 from uhei/mac-doc 
Doc: Update macOS install instructions
 2019-05-10 22:59:26 +02:00
Uli Heilmeier 345f936054 Doc: Update macOS install instruction 
Reviewed install instructions for macOS and updated where necessary.
 2019-05-10 22:39:54 +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 fa87266efc update new format doc 2019-05-10 08:37:52 +02:00
Philippe Teuwen 7928a82434 uart_win32: Remove debug msgs 2019-05-10 07:46:49 +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 107b3873fb fix 14a sniff timings by moving away debug msg 2019-05-09 15:24:41 +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