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

4914 commits

Author SHA1 Message Date
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
iceman1001 1694eaef0a detect iClass vs PicoPass 2019-10-19 15:38:53 +02:00
iceman1001 f094e8fd50 Add - automatic try LF and HF search and if both fail, try lf read and save a trace file 2019-10-19 13:13:00 +02:00
iceman1001 65f7d8cac9 add: 'script run init_rdv4' - lua script to help setup your RDV4 initally 2019-10-17 23:05:15 +02:00
iceman1001 a823c7821f chg: 'sc upgrade' - ignore case on all platforms 2019-10-17 22:30:18 +02:00
iceman1001 ed565d04f5 chg: remark available in lua 2019-10-17 22:28:49 +02:00
iceman1001 2c4e660605 fix 2019-10-17 22:24:32 +02:00
iceman1001 9fdc29e91c chg: 'hf search' - add FeliCa detection 2019-10-17 21:58:57 +02:00
Iceman a5e94c5a1d
Merge pull request #443 from 7homasSutter/master 
Add reader and raw command for FeliCa standard cards
 2019-10-17 14:02:22 +02:00
Philippe Teuwen 945fb82b48 make style 2019-10-17 13:58:22 +02:00
Thomas Sutter 376e367d45 Make Style and remove some comments. 2019-10-17 13:48:34 +02:00
Thomas Sutter 97f85ba50a Remove printf from client. Ready for testing. 2019-10-17 12:54:56 +02:00
Thomas Sutter 4da87d3f96 Fix Client Response for RAW command. Client should receives now all response octects. 2019-10-17 11:46:59 +02:00
iceman1001 2ae2e1fff5 textual 2019-10-17 09:31:37 +02:00
iceman1001 5c0dfdbf6b chg: send ref instead 2019-10-17 09:27:55 +02:00
iceman1001 ce4711cc13 revert printf 2019-10-16 15:45:52 +02:00
iceman1001 801ace94a2 dummy gui compilation on OSX.. 2019-10-16 15:37:39 +02:00
iceman1001 224b03a1f8 chg printf.. 2019-10-16 15:09:20 +02:00
iceman1001 5737355985 chg renable win ansi test. trying turning offlogging. @doegox can refacor this away when we get a prefs.json settings file 2019-10-16 14:46:57 +02:00
Thomas Sutter 9d3331511b Fix FeliCa select_card. Selection works now for FeliCa standard cards. 
Fix SendRaw data.
Add some new unfinished cmds.
 2019-10-16 14:17:52 +02:00
Iceman d401041ed9
Merge pull request #440 from mwalker33/dev2 
Removed Windows 10 color option.
 2019-10-16 11:33:14 +02:00
mwalker33 c3c45e03ce Update proxmark3.c 2019-10-16 20:24:03 +11:00
iceman1001 cce04ef93c textual 2019-10-16 10:57:14 +02:00
Philippe Teuwen f9bf50e20b add xrefs between t55 menu and lf clone commands 2019-10-16 10:48:03 +02:00
Philippe Teuwen abf81bbbb7 log help as well, for consistent logging experience 2019-10-16 10:43:44 +02:00
iceman1001 726c421b1e textual 2019-10-16 10:38:05 +02:00
iceman1001 cec9330a79 textual 2019-10-16 10:32:50 +02:00
iceman1001 db3da4d224 textual 2019-10-16 10:28:53 +02:00
iceman1001 bae3f65db6 textual 2019-10-16 10:22:41 +02:00
Philippe Teuwen 3fce47d023 Add hw tia to trigger a new Timing Interval Acquisition 2019-10-15 15:02:34 +02:00
iceman1001 bd13f72a59 textual 2019-10-14 22:32:58 +02:00
Philippe Teuwen 47d6eef7c9 usage 2019-10-13 01:21:59 +02:00
Philippe Teuwen 395d0f9ebf make style 2019-10-13 00:48:26 +02:00
Philippe Teuwen 63711dd312 fix gcc8 failure, man sprintf: 
Some programs imprudently rely on code such as the following
sprintf(buf, "%s some further text", buf);
to append text to buf.  However, the standards explicitly note that the results are undefined if source and destination buffers overlap  when  calling  sprintf(),  snprintf(),  vsprintf(),  and  vs‐
nprintf().  Depending on the version of gcc(1) used, and the compiler options employed, calls such as the above will not produce the expected results.
 2019-10-13 00:31:21 +02:00
Philippe Teuwen a41914947a
Merge pull request #435 from mwalker33/master 
T55xx save and restore (.bin, .eml)
 2019-10-13 00:18:22 +02:00
iceman1001 b745602d8c Motorola. FC guessing. CSN mapped straight from Indala descramble. 2019-10-12 12:36:09 +02:00
mwalker33 44b25cc6ac Update cmdlft55xx.c 
removed extra comma.
 2019-10-12 17:55:23 +11:00
iceman1001 354c5f2ea8 q 2019-10-11 23:13:58 +02:00
iceman1001 71baf71e17 Add 'lf motorola *' commands. Old grey Motorola cards, presumably Flexpass, which operates in 74 kHz, PSK1 , Clock 32. No chance a t55x7 can clone it :), simulation should be doable 2019-10-11 23:13:52 +02:00
mwalker33 6787144dbc Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-10-11 21:16:52 +11:00
mwalker33 25182d8e2f Update cmdlft55xx.c 
Fix travis initilisation error.
 2019-10-11 21:16:28 +11:00
mwalker33 33ed92849c
Merge branch 'master' into master 2019-10-11 20:42:36 +11:00
mwalker33 f109915ebd T55xx Save and Restore 2019-10-11 20:29:20 +11:00
iceman1001 9c82f84fa7 analyze demodbuff - fill demodbuffer with binary from client 2019-10-11 11:26:14 +02:00
martinbeier baffd45d5a
fixed indala FC decoding 2019-10-10 16:01:54 +02:00
iceman1001 d61a7b4a0f textual 2019-10-10 15:10:22 +02:00
mwalker33 67b575c728
Merge pull request #18 from RfidResearchGroup/master 
Update from RRG
 2019-10-10 23:40:04 +11:00
martinbeier 1262270924
added indala 26bit decoding 2019-10-10 14:25:41 +02:00
mwalker33 f0ae164fdf Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into RfidResearchGroup-master 2019-10-10 23:13:20 +11:00
iceman1001 ed4cdc8b75 coverity 226411 2019-10-10 13:11:29 +02:00
mwalker33 18520a5dfd Update cmdlft55xx.c 2019-10-10 22:07:57 +11:00
iceman1001 f6c1e73378 coverity 263230 2019-10-10 12:34:11 +02:00
mwalker33 1181a9792e Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-10-10 21:29:57 +11:00
mwalker33 e435d8a6ff t55x7 save and restore eml/bin 2019-10-10 21:27:48 +11:00
Philippe Teuwen c2b448de0f elite_crack: static include else we get issue with gcov 2019-10-10 12:02:01 +02:00
iceman1001 9be5627537 should unify authors messages, remove from individual functions that was done for awhile 2019-10-10 11:37:36 +02:00
iceman1001 371a0e3ee0 coverity 226308 2019-10-10 11:13:14 +02:00
iceman1001 b62e4dfa36 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-10 10:24:21 +02:00
iceman1001 762075f34a textual 2019-10-10 07:56:39 +02:00
Philippe Teuwen 904f0fe2fd coverity 226229 2019-10-10 00:08:30 +02:00
Philippe Teuwen 755ac62ab8 coverity 226422 2019-10-09 23:38:41 +02:00
Philippe Teuwen b6c683bd02 coverity 226304 2019-10-09 23:34:19 +02:00
Philippe Teuwen f4ec8463a4 coverity 226367 - strange indala code 2019-10-09 23:31:22 +02:00
Philippe Teuwen 209fa45107 coverity 226215 2019-10-09 22:44:25 +02:00
Philippe Teuwen d3efe5342c misspelled fct 2019-10-09 22:32:38 +02:00
Philippe Teuwen 7b482c64b1 coverity 226188 2019-10-09 22:29:42 +02:00
Philippe Teuwen b7d543888c coverity 226272 2019-10-09 22:24:54 +02:00
Philippe Teuwen 31cf435045 coverity 226359 2019-10-09 21:55:01 +02:00
Philippe Teuwen 54585089a3 coverity 226339 2019-10-09 21:36:29 +02:00
Philippe Teuwen 31efbf9a59 coverity 226275 2019-10-09 21:17:27 +02:00
Philippe Teuwen 30168d1e20 coverity 226247 2019-10-09 21:14:55 +02:00
Philippe Teuwen e3b267112f coverity 226372 - leak 2019-10-09 21:07:33 +02:00
Philippe Teuwen 5017e33b6d coverity 226232 - tainted input 2019-10-09 19:44:06 +02:00
Philippe Teuwen 8b99cd0303 Add SKIPQT makefile var 2019-10-09 19:28:37 +02:00
David Lam 906193981f textual changes 2019-10-09 12:48:45 -04:00
Philippe Teuwen d588b04537 fix more printf api warnings/bugs 2019-10-09 18:03:56 +02:00
iceman1001 69274a1184 fix 2019-10-09 15:23:58 +02:00
iceman1001 d8dba632be coverity 226322 - resourceleak 2019-10-09 15:06:22 +02:00
iceman1001 0556c83570 fixes 2019-10-09 14:30:50 +02:00
iceman1001 9b0e70ca27 fixes 2019-10-09 14:28:52 +02:00
iceman1001 55c33e75ef coverity 226254... - printf 2019-10-09 14:25:13 +02:00
iceman1001 16f1866943 coverity 226410 - printf 2019-10-09 14:22:35 +02:00
iceman1001 f1b15d8e07 coverity 226425 - printf 2019-10-09 14:21:09 +02:00
iceman1001 be51e98d7c coverity 226361 - printf 2019-10-09 14:19:10 +02:00
iceman1001 3ba529612e coverity 226321 - printf 2019-10-09 14:17:28 +02:00
iceman1001 26c8f680fc coverity 226289 - printf 2019-10-09 14:14:27 +02:00
iceman1001 81e7e34a24 revert tainted 2019-10-09 13:44:51 +02:00
iceman1001 ab222a06b9 ..revert 2019-10-09 13:19:47 +02:00
iceman1001 3361715121 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-09 13:11:26 +02:00
iceman1001 8842421422 coverity 71844 - fix untrusted value. fgets could have nulled the pointer. 2019-10-09 13:11:22 +02:00
Philippe Teuwen 86a47a3282 dangerous stuff... 2019-10-09 13:03:23 +02:00
iceman1001 2b50ccbef8 coverity 226404 - fix ignoring number.. 2019-10-09 13:00:22 +02:00
iceman1001 201817d7e4 coverity 226430 - printf args 2019-10-09 12:56:11 +02:00
iceman1001 b9c020a1dd coverity 227802 - fix uninitialized 2019-10-09 12:46:01 +02:00
iceman1001 0aa88aecf5 coverity - fix tainted 2019-10-09 12:45:12 +02:00
iceman1001 6d3adf71b6 coverity 226370 - fix resource leak 2019-10-09 12:44:17 +02:00
iceman1001 b993819b92 coverity 226268 - fix resource leak 2019-10-09 11:52:38 +02:00
iceman1001 08e62afc59 coverity 226277 - fix resource leak 2019-10-09 11:50:55 +02:00
iceman1001 cd0a47308d coverity 226337 - fix resource leak 2019-10-09 11:47:56 +02:00
iceman1001 84f5f0352f coverity 226350 - fix resource leak 2019-10-09 11:46:11 +02:00
iceman1001 6835cfd76a textual 2019-10-09 11:21:53 +02:00
iceman1001 b463f2ab5a coverity 226340, make sure its not null 2019-10-09 10:48:20 +02:00
iceman1001 abb011c179 fix: wrong key copied 2019-10-09 10:41:59 +02:00
iceman1001 ba461b8e1b fix: wrong size when going to calloc 2019-10-09 10:39:36 +02:00
iceman1001 0a50d8f845 adjustments 2019-10-08 22:02:02 +02:00
iceman1001 10a4361ccc Add: 'lf gallagher *' support. Unknown how to decode to printed number yet. 2019-10-08 21:45:40 +02:00
iceman1001 7affb00e76 textual 2019-10-08 19:55:01 +02:00
iceman1001 3a63b72741 Chg: 'hf mf autopwn' - skip extra checks if all keys found on first check 2019-10-08 19:49:34 +02:00
David Lam 96bc4438e9 remove extra spaces 2019-10-08 12:42:51 -04:00
iceman1001 3586cad12f freMerge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-08 16:13:46 +02:00
Philippe Teuwen e7a632292d fix t55 comments 2019-10-08 16:13:36 +02:00
iceman1001 85f5498163 yes 
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
 2019-10-08 16:13:05 +02:00
iceman1001 6d1e109c82 filechecks.. could fail stat call and directory could be symlinked 2019-10-08 16:11:01 +02:00
Philippe Teuwen 813f1e228c fix nedap examples 2019-10-08 16:10:50 +02:00
iceman1001 c4249ecbb8 WiP - 'lf t55xx restore' - read a dump file and restore it to a t55xx card 2019-10-08 15:24:06 +02:00
iceman1001 9cbfe5481b chg: lf t55xx brute / lf t55xx chk / lf t55xx recoverpwd - now shows help when called without params 2019-10-08 14:16:46 +02:00
Philippe Teuwen caf1ce4a43
Merge branch 'master' into master 2019-10-08 14:03:32 +02:00