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

5030 commits

Author SHA1 Message Date
iceman1001 7bb5f51340 style 2019-12-24 09:52:11 +01:00
iceman1001 aeb3f74c10 Add: 'hf lto list' - annotation for LTO-CM 2019-12-24 00:57:15 +01:00
iceman1001 db32e20554 spaces 2019-12-23 22:24:45 +01:00
iceman1001 15cafbe6c2 fix: hw search for lto 2019-12-23 22:24:11 +01:00
iceman1001 ed3e0895b5 hook it up 2019-12-23 22:00:34 +01:00
iceman1001 a6a48f0e6d Chg 'hf 14a info' - static/fixed nonce detection 2019-12-23 15:23:04 +01:00
iceman1001 07b3b6ed4e textual 2019-12-23 10:42:42 +01:00
iceman1001 9a68c52438 inline some compare 2019-12-23 10:41:54 +01:00
iceman1001 66426cee1e chg: - adapt to new data save parameter 2019-12-22 12:56:51 +01:00
iceman1001 ea5680dba8 style 2019-12-22 12:51:40 +01:00
iceman1001 a4407ae9f1 add: saving as wave format for LF traces, thanks (@anon)\n chg: 'data save f <filename> w - reword the params to command 2019-12-22 11:19:06 +01:00
iceman1001 286333ca91 add: hf lto info - skeleton to add LTO-CM (Cartridge memort) to PM3 2019-12-22 11:16:59 +01:00
iceman1001 337a1d1dca more 2019-12-21 18:17:03 +01:00
iceman1001 3ddf7a0ce5 iso15 - add some annotation for write mulit 2019-12-20 11:23:27 +01:00
iceman1001 85170f914e b0 doesnt use crc 2019-12-20 11:19:58 +01:00
iceman1001 25b2a8b06b nice output 2019-12-19 22:51:41 +01:00
iceman1001 818de78a1c fix wrong vars name 2019-12-19 22:34:07 +01:00
iceman1001 46783e519a removing some crc 2019-12-19 22:32:00 +01:00
iceman1001 cbff5bcace fixng the read command 0-31bytes 2019-12-19 22:24:03 +01:00
iceman1001 72d51a7774 more fixes 2019-12-19 22:11:35 +01:00
iceman1001 d3723c2649 lto_dump - added 14a connect, no_select options 2019-12-19 21:59:45 +01:00
iceman1001 39b7658528 lto_dump fixes - wrong if-statement, wrong argument for 7bit 2019-12-19 21:03:07 +01:00
iceman1001 0cb57915a1 lto-cm lua script by @kevin. reworked to be more flexble. wip. 2019-12-18 10:14:35 +01:00
iceman1001 08f411de65 textual 2019-12-18 10:13:41 +01:00
iceman1001 b6db3bb43a ?Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-12-17 13:38:08 +01:00
Thomas Sutter 93243f89d9 Fix swapping. Make Style. 2019-12-17 13:18:00 +01:00
Thomas Sutter 040255cdc6 Make style. 2019-12-17 13:10:06 +01:00
Thomas Sutter bb53a40adb Add auth1 output - experimental. 
Add auth2 command - experimental.
 2019-12-17 13:09:14 +01:00
Thomas Sutter a65cfc5f4b Fix auth1 response. 2019-12-17 08:19:42 +01:00
Thomas Sutter 47a416a3ac Fix key length in auth1 command. 2019-12-16 14:08:30 +01:00
iceman1001 6a21c780fa chg: lf gallagher demod - using the research from Matt, @megabug, to get better support. WIP. 2019-12-16 13:51:10 +01:00
Thomas Sutter d1906aa03e Change logs to info. Make style. 2019-12-16 11:25:15 +01:00
Thomas Sutter 8ce30f54d2 Merge remote-tracking branch 'upstream/master' into felica_support_authV1 
# Conflicts:
#	client/cmdhffelica.c
 2019-12-16 11:20:48 +01:00
Thomas Sutter 3f3366429f Add Auth1 Command (Alpha). Untested. 2019-12-16 11:06:48 +01:00
iceman1001 8e45e0e56b textual 2019-12-14 12:57:25 +01:00
iceman1001 f4427b05b2 hf seach - textual 2019-12-14 12:56:19 +01:00
iceman1001 bd70689de2 hf mf nested: break bad loop if timeout (@uzlonewolf) 2019-12-14 12:45:07 +01:00
iceman1001 64d08de6a6 textual 2019-12-11 15:56:36 +01:00
iceman1001 75a5b2efb3 textual 2019-12-10 18:30:18 +01:00
iceman1001 9f47a0a8f4 textual 2019-12-10 18:26:22 +01:00
iceman1001 24d3bf5d9d textual 2019-12-10 18:26:09 +01:00
iceman1001 a66944f7e7 newline 2019-12-10 18:15:51 +01:00
iceman1001 3dd380e985 newline 2019-12-10 18:13:21 +01:00
iceman1001 b748a7989e nexwatch textual, wrong endianess 2019-12-08 18:49:26 +01:00
merlokk 8425de08fd textual 2019-12-06 17:21:45 +02:00
merlokk 45926261db style 2019-12-06 17:12:29 +02:00
merlokk 326e6aa9f2 added hf mf cwipe 2019-12-06 17:04:22 +02:00
iceman1001 5773919f58 textual 2019-12-06 08:51:24 +01:00
iceman1001 3d366d50ef style 2019-12-03 14:53:08 +01:00
iceman1001 3d4a63f46a style 2019-12-03 14:52:34 +01:00
iceman1001 9782f447eb style 2019-12-03 14:52:17 +01:00
iceman1001 b5be8a3663 style 2019-12-03 14:51:55 +01:00
iceman1001 85ff07caa6 chg: return codes etc 2019-12-02 11:53:50 +01:00
iceman1001 e812726c70 chg: return codes etc 2019-12-02 11:47:43 +01:00
iceman1001 535298820b chg: return codes etc 2019-12-02 11:40:22 +01:00
iceman1001 56c4343081 chg: hf 15 csetuid - verify uid is the same after writting 2019-12-02 10:21:32 +01:00
iceman1001 a0f0345169 fix travis 2019-12-02 10:20:07 +01:00
Iceman 3b01177e5f
Merge pull request #484 from merlokk/mfp_check 
hf mfp check
 2019-12-02 09:58:55 +01:00
merlokk 8132de9b4f fix braces 2019-12-01 23:43:47 +02:00
merlokk 256782402e fix linux make errors 2019-12-01 23:39:41 +02:00
merlokk bc27b0e910 add some help 2019-12-01 23:36:34 +02:00
merlokk 2dfbe151b9 hf mfp check: dictionary works, verbose mode works 2019-12-01 23:21:00 +02:00
merlokk 94eb741a4f refactoring + make dictionary works 2019-12-01 22:33:50 +02:00
iceman1001 fef245be26 textual 2019-12-01 11:32:49 +01:00
merlokk 131730e7db fix docstrings 2019-12-01 11:01:56 +02:00
merlokk ca462424d0 refactoring 2019-12-01 10:56:41 +02:00
merlokk 1daf155b9c added dictionary 2019-12-01 10:45:02 +02:00
merlokk e88f4e4cd8 added hex_to_bytes 2019-12-01 01:22:05 +02:00
merlokk a6a16cfd0c add dictionary search check hex 2019-12-01 00:36:28 +02:00
merlokk de52ebc3d5 1dd 16 byte key for dictionaries 2019-12-01 00:30:35 +02:00
merlokk 0cb7637e1f added save keys to json for mfp check 2019-11-30 23:46:37 +02:00
merlokk 34e38c9dc5 added json save mfp 2019-11-30 23:45:51 +02:00
iceman1001 5fa2eb9db8 textual 2019-11-30 22:25:53 +01:00
iceman1001 1a052b2607 textual 2019-11-30 20:15:50 +01:00
iceman1001 6166849382 textual 2019-11-30 20:04:37 +01:00
iceman1001 bd80fa254e textual 2019-11-30 20:02:02 +01:00
iceman1001 3ad7c0d319 textual 2019-11-30 19:57:29 +01:00
iceman1001 b8a339361b textual 2019-11-30 17:06:03 +01:00
merlokk 8e6f08835d added some error handling 2019-11-29 17:34:54 +02:00
merlokk a861d2971c specify key in the command line 2019-11-29 17:29:36 +02:00
merlokk 1efc731fac refactoring and break operation via keyboard 2019-11-29 17:23:30 +02:00
merlokk 385a747dbd added search 2-byte pattern 2019-11-28 16:24:39 +02:00
merlokk 9f8a8cce96 refactoring. move key list to uint8_t[16] array 2019-11-28 15:36:52 +02:00
merlokk 2c101ebbb9 internal keys search works 2019-11-28 15:16:11 +02:00
merlokk 133d59e483 added command parsing and result printing 2019-11-28 14:16:53 +02:00
merlokk 17a2379ddd hf mfp check sketch 2019-11-28 00:49:12 +02:00
merlokk 8cb28a21c6 add mfp default keys 2019-11-28 00:48:39 +02:00
Iceman 48218687d7
Merge pull request #481 from grspy/master 
Add ISO15693 write AFI/DSFID commands and NXP Sysinfo for Slix2
 2019-11-27 21:11:03 +01:00
unknown ecaf919365 Hf15FindAfi WaitForResponse loop 2019-11-27 21:14:31 +02:00
unknown 931d115ef8 HF15FindAfi now uses reply_ng and added LeaveFieldOn option for HF15Raw 2019-11-27 15:11:43 +02:00
unknown cef28ad241 HF15 cmds return codes and dropfield where needed 2019-11-26 22:11:02 +02:00
unknown 16e4cf9679 Add ISO15693 write AFI/DSFID commands and NXP Sysinfo for Slix2 2019-11-25 20:53:06 +02:00
iceman1001 13c16e9af7 return codes 2019-11-24 21:14:27 +01:00
iceman1001 ef19979c34 chg: hf 14b write - adding colors 2019-11-24 19:27:08 +01:00
unknown 1b6566cd5c Added support for some ISO15693 custom NXP commands 2019-11-22 13:55:09 +02:00
iceman1001 41e0bf9a50 chg: odl flexpass code removed 2019-11-19 12:17:08 +01:00
iceman1001 3a7a6cce38 chg: hf thin info - honor verbose 2019-11-19 12:14:58 +01:00
iceman1001 290c6f6c31 chg: hf 14a sim x - device simulation loop exited when client exits 2019-11-19 12:01:04 +01:00
Denis Bodor d8a26e2b8b switch from lua CRC16/ARC to CRC RevEng 2019-11-19 10:55:17 +01:00
Denis Bodor dec0b0202a Add Luxeo dump script 2019-11-17 12:58:30 +01:00
iceman1001 93c9dc571f chg t55 timings to match offical repo when compiling for PM3OTHER 2019-11-12 19:27:34 +01:00
iceman1001 24638a832d more keys 2019-11-11 16:42:25 +01:00
bogiton a0168441d8
Update read_pwd_mem_spiffs.lua 2019-11-08 17:46:15 +00:00
bogiton 11b0a69869
Update read_pwd_mem.lua 2019-11-08 17:44:52 +00:00
iceman1001 2c0a8bbd91 make style 2019-11-08 12:01:46 +01:00
iceman1001 182f239d21 make style 2019-11-08 12:00:21 +01:00
iceman1001 5cca8616cb Add: 'hf mfu otptear' - draft of @fukmar implementation for a tear-off attack against OTP block on Mifare Ultralight based card. 2019-11-08 10:28:29 +01:00
iceman1001 a0204386f0 chg: new samples has less similar preamble 2019-11-07 07:23:13 +01:00
Philippe Teuwen ad475a224e hf mf wrbl: don't give as example how to write a block0 with faulty BCC, remove mfc stuff in df 2019-11-05 23:15:01 +01:00
iceman1001 50bf809a4b textual 2019-11-05 20:04:29 +01:00
merlokk 7ea2c0753c aidlist 2019-11-05 16:01:05 +02:00
iceman1001 aabf3ecafa removed problematic code. Attribution to @jamchamb for his amii lua scripts 2019-11-05 10:51:27 +01:00
iceman1001 485eccd670 textual 2019-11-05 10:44:55 +01:00
Oleg Moiseenko 7b650e98a0
Merge pull request #465 from merlokk/hf_info_aid_search 
Hf info aid search
 2019-11-05 02:07:02 +03:00
merlokk 12cae27862 select result tlv decode and some diags print 2019-11-05 00:40:58 +02:00
merlokk 8befad6d34 hf 14a info: added verbose, command optimization, move it to cliparser 2019-11-05 00:06:51 +02:00
Philippe Teuwen 8cff4a24bb
Merge pull request #452 from Fl0-0/fix-for-#450 
Fix for hf mf autopwn #db# AcquireNonces: Auth1 error loop, revert co…
 2019-11-04 22:29:08 +01:00
merlokk 6eb7c8e7a5 fixed aid selection 2019-11-04 23:21:02 +02:00
merlokk 2a4a9745c9 aid search works 2019-11-04 21:18:37 +02:00
merlokk 766262033a some text improvements 2019-11-04 20:20:42 +02:00
merlokk 0b5cc59bcd aidsearch works 2019-11-04 20:15:09 +02:00
merlokk c861f68a87 fix aidlist 2019-11-04 20:14:43 +02:00
merlokk b07e33bcdb changed signature of hf info 2019-11-04 19:54:51 +02:00
merlokk d14644c09f add aidsearch sketch 2019-11-04 19:54:23 +02:00
merlokk 706d8cc332 fix aidlist 2019-11-04 19:53:53 +02:00
Philippe Teuwen 59730ee4fd mfc keys dict: -☻ 2019-11-04 18:31:44 +01:00
merlokk 032019763e add tesla https://gist.github.com/darconeous/2cd2de11148e3a75685940158bddf933 2019-11-04 18:08:46 +02:00
merlokk 0980e619bf updated aid list 2019-11-04 18:03:23 +02:00
iceman1001 68ac8dd979 fix: cotag use NG 2019-11-04 15:42:28 +01:00
Iceman 44d3539cbf
Merge pull request #463 from 7homasSutter/felica_support_fix_raw 
Felica support: Add new commands
 2019-11-04 12:12:25 +01:00
Thomas Sutter 601b8d281a Add command request system code. 
Add command request specification version.
Add command reset mode.
Make Style.
 2019-11-04 10:24:29 +01:00
bogiton 7a79901ed0
Add read_pwd_mem_spiffs.lua 2019-11-02 18:08:59 +00:00
bogiton 22b7d54362
Add GetFromFlashMemSpiffs in scripting.c 2019-11-02 18:07:36 +00:00
iceman1001 06076708a7 chg: less stack pressure. And now also free:ing 2019-11-02 17:59:06 +01:00
Iceman cd9ff9e61c
Merge pull request #459 from 7homasSutter/felica_support_sniffing 
Felica support sniffing
 2019-11-02 17:36:00 +01:00
iceman1001 025234ba2b yes 2019-11-02 17:29:20 +01:00
Thomas Sutter c76c59a35c Fix segmentation fault in cmd. 2019-11-02 13:29:38 +01:00
Thomas Sutter 42fd13985f Make style. 2019-11-01 15:19:09 +01:00
Thomas Sutter b422b79679 Merge remote-tracking branch 'upstream/master' into felica_support_sniffing 2019-11-01 15:12:24 +01:00
Thomas Sutter dadad1dacf Fix felica sniffing. 2019-11-01 15:06:48 +01:00
iceman1001 b383b16ded chg: lf fdx clone/sim - added extended data 2019-10-31 08:39:11 +01:00
iceman1001 eb7fd5f8ab textual 2019-10-30 15:45:52 +01:00
iceman1001 01b149efa5 fix: fdx crc calc 2019-10-30 15:44:57 +01:00
Thomas Sutter 9738834faf Remove unused function. 2019-10-30 13:43:23 +01:00
Thomas Sutter f3d79c22f2 Remove parity bit check for felica. 2019-10-30 13:42:52 +01:00
Thomas Sutter 1a852e02c7 Fix sniffing command. 
Refactor hf list felica.
 2019-10-30 13:35:03 +01:00
iceman1001 417679c3d8 more keys 2019-10-30 11:16:53 +01:00
iceman1001 c6f4bf2aa6 return codes 2019-10-29 19:32:27 +01:00
Thomas Sutter 76215fffc6 Refactor sniffing command. 2019-10-29 15:39:54 +01:00
Thomas Sutter eba19c0bd6 Make style. 2019-10-29 13:35:09 +01:00
Thomas Sutter 83c629cbec Fix parameter i parsing bug. 2019-10-29 12:52:45 +01:00
Thomas Sutter 2e60cb4fa6 Add write without encryption command. 2019-10-29 11:14:38 +01:00
Thomas Sutter 498c4b8377 Refactor FeliCa structs. 2019-10-29 10:22:47 +01:00
Thomas Sutter 06f3f1b637 Remove code duplication. 2019-10-29 10:00:47 +01:00
Thomas Sutter 271a8ce548 Add additional check for xero byte response. 
Add wrunencrypted usage text.
 2019-10-29 09:44:38 +01:00
Philippe Teuwen 900184b600 ikeys: "declaration shadows a variable in the global scope" warning 2019-10-26 20:37:55 +02:00
Philippe Teuwen 6c048c5026 comms.c dl_it: remove unused arg 2019-10-26 19:49:46 +02:00
Philippe Teuwen cc902fb4d8 ui.c: warnings discarded qualifiers 2019-10-26 19:40:59 +02:00
Philippe Teuwen 11b954b6bd proxmark.c: warnings discarded qualifiers 2019-10-26 19:40:32 +02:00
Philippe Teuwen 129b1c4b1f make sure all .c include their own .h 2019-10-26 18:56:36 +02:00
Philippe Teuwen af75c70c27 wiegand: no previous prototype warnings 2019-10-26 18:49:25 +02:00
mwalker33 9c2ef4e0da 2nd Win10 Color Reg. Key Check 2019-10-26 13:17:33 +11:00
Fl0-0 6f3f5d2d83
Fix for hf mf autopwn #db# AcquireNonces: Auth1 error loop, revert commit abb011c 2019-10-25 14:53:08 +02:00
Philippe Teuwen 07cf3fd32b fix few missing declarations -> static or add include file 2019-10-25 00:55:16 +02:00
Philippe Teuwen 390d0ab525 lf tune: allow float, added parse_getfloat to utils 2019-10-25 00:53:56 +02:00
Philippe Teuwen eb7268cd98 lf: change macros to allow float freq, change 134 -> 134.2 2019-10-25 00:42:47 +02:00
Philippe Teuwen cb06bea448
Merge pull request #451 from 7homasSutter/felica_support_read_without_encryption 
Felica support: add commands request response and read without encryption
 2019-10-24 21:33:27 +02:00
Thomas Sutter 12cd208253 Make style. Format help text. 2019-10-24 17:07:27 +02:00
Thomas Sutter bfd5214cd5 Add read_without_encryption command. 2019-10-24 16:08:44 +02:00
Thomas Sutter 94ec36de20 Add status flag interpretation. 2019-10-24 11:59:58 +02:00
Thomas Sutter 003aada18f Add basic read_without_encryption command. 2019-10-24 11:30:52 +02:00
Thomas Sutter 94cc2c0473 Merge remote-tracking branch 'upstream/master' into felica_support_request_service 
# Conflicts:
#	client/cmdhffelica.c
 2019-10-24 08:53:41 +02:00
Thomas Sutter 3b0447fbb3 Draft read without encryption 2019-10-24 08:44:20 +02:00
Philippe Teuwen ff9eabdab5 coverity 226329 invalid type for printf 2019-10-24 01:35:58 +02:00
Thomas Sutter 1f7dd3e2a7 Add request response command for felica Mode. 2019-10-23 14:48:23 +02:00
Thomas Sutter bdbb4cb5c9 Refactor request service parsing. 
Change Examples.
 2019-10-23 13:25:52 +02:00
Thomas Sutter 21f0095029 Make Style. 2019-10-23 09:42:45 +02:00
Thomas Sutter 2274383129 Remove crc methode. Add CRC macro. 
Change help text for request service.
 2019-10-23 09:21:43 +02:00
Thomas Sutter c122483794 Merge remote-tracking branch 'upstream/master' into felica_support_request_service 
# Conflicts:
#	client/cmdhffelica.c
 2019-10-22 17:16:50 +02:00
Thomas Sutter b6117e4996 Add parameter a to usage text. 2019-10-22 17:10:32 +02:00
Thomas Sutter 3f56116615 Add felica request service all nodes command. 
Make style.
 2019-10-22 17:03:54 +02:00
Thomas Sutter 6144e2d09b Add felica request service command. 
Add cmd parser functions.
 2019-10-22 15:56:05 +02:00
Philippe Teuwen 8792679fc8 make style 2019-10-21 13:46:23 +02:00
Philippe Teuwen e54edfd8db wiegand: use ARRAYLEN 2019-10-21 13:44:08 +02:00
Thomas Sutter e7f7810d22 Make style. Change DBG_DEBUG. Refactor CRC calculation 2019-10-21 09:59:15 +02:00
Thomas Sutter 3a3b66d079 Fix build 2019-10-20 20:28:57 +02:00
Thomas Sutter a3f8d635ca Add new cmd parser functions. 2019-10-20 20:26:00 +02:00
grspy 7cbac6067e
Fix pack in dump 
PACK wasn't included in the output dump due to incorrect check of ul_auth_select return value
 2019-10-20 20:08:52 +03:00
Thomas Sutter ce4c651853 Merge remote-tracking branch 'upstream/master' into felica_support_request_service 
# Conflicts:
#	armsrc/felica.c
#	client/cmdhffelica.c
 2019-10-20 18:40:16 +02:00
Thomas Sutter f7d4f2e9f3 Unfinished request service commands. 2019-10-20 18:28:07 +02:00
iceman1001 2f573ebfb3 fix: unshadow 2019-10-20 06:31:49 -04:00
iceman1001 339f499a25 fix: unshadow 2019-10-20 06:30:09 -04:00
iceman1001 2ba8d07e1b fix: unshadow 2019-10-20 06:28:49 -04:00
iceman1001 6091894b72 fix: unshadow 2019-10-20 06:25:29 -04:00
iceman1001 7b2b49ff73 fix: sanity check 2019-10-20 06:24:46 -04:00
iceman1001 29573f1ac5 fix 2019-10-20 06:23:57 -04:00
iceman1001 b0e01f9236 fix: double free 2019-10-19 16:46:11 -04:00
iceman1001 e5df52fb86 fix: bools 2019-10-19 16:42:37 -04:00
iceman1001 4ab4746104 fix: bad bool 2019-10-19 16:39:28 -04:00
iceman1001 c9a390a480 fix 2019-10-19 16:35:21 -04:00