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

6150 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iceman1001 41acc98d87 mix 2019-05-15 12:03:00 +02:00
iceman1001 0edf5500fe mix 2019-05-15 12:02:22 +02:00
iceman1001 fae572a569 mix 2019-05-15 04:31:52 -04:00
iceman1001 46f6548d1f to send MIX,.. 2019-05-15 10:24:25 +02:00
iceman1001 0740d14faa chg: some unifiying return values 2019-05-15 10:24:06 +02:00
Philippe Teuwen bc090857b8 text 2019-05-15 08:57:15 +02:00
iceman1001 1e31455474 textual 2019-05-15 02:18:23 -04:00
Philippe Teuwen 8401eb4e14 Add usart btfactory 2019-05-15 02:15:19 +02:00
iceman1001 63cf6be691 guarded 2019-05-14 16:20:34 -04:00
iceman1001 a988c8ffef chg: hw status - now prints number of dictionary keys loaded. Dont print if zero/default empty 0xffff 2019-05-14 14:57:56 -04:00
iceman1001 586e2ebabd textual 2019-05-14 11:42:58 -04:00
iceman1001 36ecc4be97 style 2019-05-14 11:42:17 -04:00
Iceman eef53a853a
Merge pull request #196 from mcd1992/guikeys 
Add clamp to PageDown case in plot GUI and updated changelog as requested in #195
 2019-05-14 17:38:35 +02:00
iceman1001 ace4798c4d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-14 17:13:54 +02:00
iceman1001 8bfe669430 fix: 'script run legic' - at last, it now saves in EML and BIN format. 2019-05-14 17:13:29 +02:00
Aaron McDaniel 1186753bf6 Added clamp to PageDown case in plot GUI and updated changelog 2019-05-14 10:12:46 -05:00
Philippe Teuwen 1147c9faf8 Use ARRAYLEN 2019-05-14 12:51:45 +02:00
iceman1001 da09131aa3 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-14 12:37:02 +02:00
iceman1001 d792f015a2 fix: 'script run legic' - bytes was in string format, 2019-05-14 12:36:37 +02:00
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 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