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

370 commits

Author SHA1 Message Date
tharexde 069018e72a Merge branch 'master' into allin 
update
 2020-10-22 01:01:59 +02:00
iceman1001 53c7e47e75 fix: hf iclass restore - now uses NG and better reporting and works :) 2020-10-14 17:41:34 +02:00
tharexde b4a8409349 clean up 2020-10-11 20:06:03 +02:00
tcprst fbc7f05ad1
rebase on master, fix merge conflict 2020-10-06 09:33:02 -04:00
Philippe Teuwen f43ad0a239 HF_YOUNG: turn leds off when quitting mode 2020-10-06 01:26:36 +02:00
Philippe Teuwen 1610bf7e23 HF_YOUNG: HF field off and sleep between polls 2020-10-06 01:26:14 +02:00
Philippe Teuwen b081684f22 HF_MATTYRUN: turn leds off when quitting mode 2020-10-06 01:17:40 +02:00
Philippe Teuwen cdd39f3ac3 HF_COLIN: HF field off and sleep between polls 2020-10-06 01:05:26 +02:00
Philippe Teuwen 6540b4561c HF_AVEFUL: allow to exit mode with long press 2020-10-06 00:52:11 +02:00
Philippe Teuwen 7b599c7f67 HF_AVEFUL: HF field off and sleep between polls 2020-10-06 00:51:52 +02:00
Philippe Teuwen fb90c078ff HF_MFSDSAL: turn HF field off 2020-10-06 00:38:30 +02:00
tharexde a9ec622d97 added standalone mode "brute force" 2020-10-03 22:59:21 +02:00
tharexde 45a1a83752 make style 2020-09-23 23:44:42 +02:00
tharexde 59483e8c3b Merge branch 'master' into allin 
update 23.9.2020
 2020-09-23 23:20:18 +02:00
tharexde 7b62035bc4 adopted log file name, renamed functions 2020-09-23 23:09:12 +02:00
Philippe Teuwen 3909053cee Rename data_readpwdmem.lua -> mem_readpwd.lua and data_readpwdmem-spiffs.lua -> mem_spiffs_readpwd.lua 2020-09-23 00:46:57 +02:00
Philippe Teuwen 610b456a97 fix lau scripts renaming 2020-09-23 00:11:11 +02:00
tharexde 51651a1e0a Merge branch 'dev_standalone' into malsehn_standalone 2020-09-23 00:07:34 +02:00
tharexde 48495bf272 added missing "endif" 2020-09-22 23:34:23 +02:00
tharexde 732d903b52 simulate/read 2020-09-22 23:31:11 +02:00
Ave fe22eafcf1
hf_aveful: Pull proper counter and tearing, bugfixes 2020-09-20 02:07:21 +03:00
Ave 4cd1c512b9
hf_aveful: Add Ultralight EV1 support, clean code, dynamically determine 
block size
 2020-09-20 01:00:57 +03:00
iceman1001 53831a4a3c adapt standalone 2020-09-06 21:42:50 +02:00
tharexde c49e2d7ba9 solved 2020-09-05 13:25:57 +02:00
Ave befb5f1c01
hf_aveful: Move Makefile.hal entry to be alphabetic 2020-09-04 00:13:41 +03:00
Ave 2687d9f3ec
hf_aveful: last minute code formatting 2020-09-03 18:44:30 +03:00
Ave 6c92b9d1ed
hf_aveful: rename from hf_aveul to hf_aveful 2020-09-03 18:38:58 +03:00
Ave c4e01ce81e
hf_aveul: Use defines to make the code easier to configure for other card types 2020-09-03 18:29:18 +03:00
Ave 51360c4d1a
hf_aveul: Extend comments 2020-09-03 17:43:47 +03:00
Ave ec877e04ea
Add hf_aveul standalone mode 2020-09-03 17:33:36 +03:00
iceman1001 c9f853de2f added references to youtube videos 2020-09-03 10:29:25 +02:00
Philippe Teuwen 4ed57c7c4d make style 2020-08-13 12:25:04 +02:00
iceman1001 94ce1a9ec9 textual 2020-08-12 11:27:41 +02:00
iceman1001 c1a5f93dab send arguments to standalone mode 2020-08-08 23:45:09 +02:00
iceman1001 8dd9c92beb simlper select 2020-08-08 22:26:05 +02:00
iceman1001 dd2e04814e textual 2020-08-08 19:44:28 +02:00
iceman1001 66d18eb00f iceclass reader attack mode to save unique files 2020-08-08 17:45:07 +02:00
iceman1001 9376846958 remove some extras 2020-08-08 07:56:28 +02:00
iceman1001 18247e892d less retries 3->2 since its so good now. read_block start /eof time in call, sanity checks, textual, save if not exist, also if current file is less than new data 2020-08-06 16:19:42 +02:00
iceman1001 dca17c3791 make sure we get aia 2020-08-06 08:12:07 +02:00
iceman1001 85f5f670b6 check if we have AA2 2020-08-03 17:37:41 +02:00
iceman1001 e147bdc71b renamed readtagfile to view\nrenamed clone to restore\nrefactored reader, info, dump, rdbl, wrbl to be on device side. Commands now also seamless works with NON_SECURE_MPAGE 2020-07-29 11:02:30 +02:00
iceman1001 9eb479fc7f iceclass calc diversified key if not present 2020-07-20 00:16:16 +02:00
iceman1001 8d5315b6af fixes to mode 2020-07-15 11:34:14 +02:00
iceman1001 ce0a2744cb hf_iceclass 2020-07-15 01:31:13 +02:00
iceman1001 99e61f82c0 rework 2020-07-14 15:57:21 +02:00
iceman1001 49192ca4c4 add: new standalone mode. hf_iceclass 2020-07-14 15:47:47 +02:00
iceman1001 b545109800 fix more lf standalone 2020-06-23 12:14:41 +02:00
iceman1001 e3c9f46425 fix lf standalones 2020-06-23 12:13:48 +02:00
iceman1001 34769f6945 fix: lf_em4100rwx 2020-06-23 12:10:09 +02:00
Monster 5e277caa0b
Merge branch 'master' into master 2020-06-23 10:51:52 +03:00
Monster c551800b0f
build fix after changes for lf_em4100rswb 
build fix after changes for lf_em4100rswb
 2020-06-23 10:34:00 +03:00
iceman1001 683954316a chg: 'lf em 410x_watch' - now uses NG and on deviceside only 2020-06-22 13:24:33 +02:00
iceman1001 b0c5ade65a adapt standalone to dynamic stack 2020-06-22 12:22:52 +02:00
iceman1001 ea73746d32 text 2020-06-10 09:02:58 +02:00
Philippe Teuwen 224cb2ffd7 make style 2020-06-08 03:15:10 +02:00
iceman1001 3d67bde0d9 old->mix 2020-05-27 17:58:34 +02:00
iceman1001 30be05ec3f chg: removed debugstatements, the code doesnt use them 2020-05-20 18:28:43 +02:00
iceman1001 b22ea6f846 fix: matty_run eloadcard 2020-05-20 18:28:10 +02:00
Philippe Teuwen b556810776 armsrc: clarify static vars vs global vars, part 2 2020-05-19 17:25:58 +02:00
iceman1001 4d355192bf remove inline 2020-05-19 17:16:23 +02:00
Philippe Teuwen 4dac94c772 clarify BUTTON macro usages 2020-05-15 00:00:42 +02:00
Philippe Teuwen 3f71be870b cppcheck on hf_mattyrun 2020-05-14 23:26:41 +02:00
iceman1001 ed11e4a093 cppcheck fix, assign a value 2020-05-14 09:18:51 +02:00
iceman1001 00b67e2cdd remove warnings of unused 2020-05-11 22:12:46 +02:00
Dmitriy Loginoov 8b8d60c667 Fixed compiler warnings. 2020-05-11 18:18:47 +03:00
Dmitriy Loginoov 91b8569391 Added changelog line, fixed mode order in Makefiles, added line to documentation. 2020-05-11 17:52:35 +03:00
Dmitriy Loginoov f4e8fc89a8 Rewrited lf_em4100rwc standalone mode, added card bruteforce mode. 2020-05-11 16:58:16 +03:00
Philippe Teuwen 8160131119 fix standalone warnings 2020-05-11 13:48:57 +02:00
Philippe Teuwen 026707b960 arm: fix prototypes 2020-05-11 13:48:57 +02:00
Philippe Teuwen 0cb21c89c3 doc 2020-05-02 23:11:49 +02:00
Philippe Teuwen 04a16ddeb5 msdsal fix bug after var de-shadowing, move stuff around 2020-04-26 17:44:45 +02:00
iceman1001 f416fa9b4f cppchecker fixes 2020-04-26 12:56:19 +02:00
Philippe Teuwen 0219aed591 arraylen 2020-04-24 18:44:42 +02:00
Philippe Teuwen 011f973e7f make style 2020-04-24 18:21:38 +02:00
Philippe Teuwen 0fe80c4a2d sorting modes 2020-04-24 18:20:37 +02:00
Philippe Teuwen 773b27954d rename standalone template 2020-04-24 18:11:27 +02:00
Philippe Teuwen 9db1c10230 new HF_MSDSAL as default standalone 2020-04-24 17:54:12 +02:00
Salvador Mendoza 9c4bfa5dcb Update hf_msdsal.c 2020-04-24 16:42:41 +02:00
Salvador Mendoza 9cd58bd9f0 Create hf_msdsal.c 2020-04-24 16:42:40 +02:00
Salvador Mendoza 80c98455ac Update Makefile.inc 2020-04-24 16:42:40 +02:00
Salvador Mendoza 7f0e759b60 Update Makefile.hal 2020-04-24 16:42:40 +02:00
Philippe Teuwen af43bdd728 doc 2020-04-23 22:36:15 +02:00
Philippe Teuwen 8bdda55115 Fix prompt colors in log -> spurious space in color macros -> adjust lots of files... 2020-04-22 02:22:55 +02:00
Philippe Teuwen 94192d0976 make style 2020-04-16 09:01:14 +02:00
Iceman 4920bd8ab0
Update Makefile.hal 2020-03-30 16:31:54 +02:00
iceman1001 690a2b89e0 textual 2020-03-30 15:16:11 +02:00
iceman1001 83a5ffbb10 textual 2020-03-30 15:12:37 +02:00
iceman1001 924ad84c59 textual 2020-03-30 15:12:06 +02:00
iceman1001 c8b51ccf25 chg: legic standalone - now saves read cards to flashmemory (RDV4)\n also simulates correct cardtype.\n It goes direct into recording / reading a tag. Once a complete dump is done, it starts to simulate 2020-03-30 15:11:48 +02:00
Uli Heilmeier db02a1f306 HF_Legic: remove global variable and cleanup 
As requested by @iceman1001:
* removed global variable
* updated according to make style
* added entry in CHANGELOG.md
 2020-03-30 10:22:45 +02:00
Uli Heilmeier 8c8a86cb83 Standalone mode: Adding Legic Prime read/sim run 
This commit adds a standalone mode for Legic Prime.
It reads and simulates a Legic tag.
Tested with MIM1024 tags.
MIM256 and MIM512 should work to. We just read the data and for simulating
we pretend to be a MIM1024 card.

Co-authored-by: Stefanie Hofmann <>
 2020-03-27 14:08:45 +01:00
Artem Gnatyuk 0abba96eb6 Add my modes after merging. 2020-03-22 00:03:16 +07:00
Artem Gnatyuk 3fb4045c16 Merge branch 'master' into lf_emul 2020-03-21 23:47:09 +07:00
Artem Gnatyuk c36d86bc01 Make style 2020-03-21 21:39:30 +07:00
Artem Gnatyuk 097595cdef [RDV4] Readed IDs store to file in spiffs 2020-03-21 21:27:57 +07:00
Artem Gnatyuk 311f43172f LF_EM4100EMULV1 - renamed to LF_EM4100EMUL. Make more easy control. Short click - switch slot and satrt simulation 
LF_EM4100EMULV2 - deleted.
LF_EM4100EMULV3 - renamed to LF_EM4100RWC
 2020-03-21 15:48:16 +07:00
Philippe Teuwen 7ad649130a fix lf_icehid on gcc v8 2020-03-13 18:19:12 +01:00
iceman1001 f13149826c cppchecker format macro 2020-03-13 13:52:55 +01:00
iceman1001 59bae5000c style 2020-03-09 16:57:13 +01:00
Artem Gnatyuk a4b8c14e1e Fix version number 2020-03-08 00:13:13 +07:00
Artem Gnatyuk 4b07fecd6b Add missed files 2020-03-08 00:07:38 +07:00
Artem Gnatyuk 618925b15c Final version 2020-03-07 23:25:24 +07:00
iceman1001 9dc419cec5 partial fix for mattyrun 2020-02-28 10:01:52 +01:00
iceman1001 3924d71f37 too small chararray 2020-02-04 21:57:33 +01:00
iceman1001 a9ffcc6892 textual 2020-02-04 17:37:19 +01:00
iceman1001 9bf26c080d chg: icehid now records HID/AWID/IO/EM4100.. 2020-02-03 21:39:44 +01:00
iceman1001 4f912abaf6 Add 'lf_icehid' - new standalone mode for reading lf HID credentials and store it to RDV4 flashmem 2020-01-30 17:05:59 +01:00
Michael Farrell 4c76d54c9a add standalone module for sniffing iso14a to flash 
This module is intentionally simple, and doesn't do anything fancy.
 2020-01-30 21:41:09 +11:00
iceman1001 657061f8d5 fix: use defines.. 2019-12-26 23:41:30 +01:00
bogiton 5e72d6e714
Update hf_bog.c 2019-11-08 17:42:17 +00:00
bogiton 85acdfe109
Update hf_bog.c 2019-11-02 18:06:02 +00:00
iceman1001 3620236725 shadow 2019-10-19 16:04:16 -04:00
iceman1001 21f93ef12a shadowing 2019-10-19 15:57:16 -04:00
Philippe Teuwen 39fd6b1910 coverity: separate crypto1 fcts ARM<>host into create/destroy and init/deinit 2019-10-18 16:58:24 +02:00
Philippe Teuwen 59e66ce5fd lf hid sim: add support for long ID 2019-09-15 02:00:42 +02:00
Ludovic Rousseau a1852eaa4b Fix typos 
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 formated formatted
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 succesfully successfully
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Skiped Skipped
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 standart standard
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 supress suppress
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 successfull successful
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Succeded Succeeded
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Overriden Overridden
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 aquire acquire
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 occured occurred
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 delimeter delimiter
 2019-09-14 17:44:58 +02:00
iceman1001 f5bff0d4e5 style 2019-09-13 16:27:25 +02:00
iceman1001 49cd525cf1 style 2019-09-13 16:26:17 +02:00
iceman1001 ffa3e2a0f8 style 2019-09-13 16:25:33 +02:00
iceman1001 1c4c21513b chg samyrun, all leds flash 5times when exiting standalone mode 2019-09-13 14:12:12 +02:00
iceman1001 871445212e chg 'lf proxebrute standalone' - simplified it. No need for clone, or multiple slots, LED A = read / record, flashing LED A 12 times, failed reader and next click try again, LED C == proxbrute, all leds flash when exiting standalone mode 2019-09-13 14:10:08 +02:00
iceman1001 3a776ecf3a chg samyrun - dual leds flash after state changes 2019-09-13 10:17:58 +02:00
iceman1001 cb23de9694 chg: feedback after successful operation. led flashes twice. and whitespace removed 2019-09-13 10:04:59 +02:00
iceman1001 a4421dfc37 fix wrong spelling 2019-09-13 07:38:07 +02:00
iceman1001 4eab354f44 chg: 'lf samyrun' standalone - rework of LED messages. 
A = bank A reading
B = bank B reading
A,C = bank A simulating
A,D = bank A cloning
B,C = bank B simulating
B,D = bank B cloning

One button press to go between steps.   Maybe practice with the proxmark3 device connected with usb-cable to see the new steps.
 2019-09-12 17:37:36 +02:00
iceman1001 3587aeff2a fix: LED is used as a flag, 1,2,4,8 not 1,2,3,4.. 2019-09-12 09:58:05 +02:00
Iceman 3408d75ac9
Update Makefile.hal 
fix https://github.com/RfidResearchGroup/proxmark3/issues/375
 2019-08-29 21:25:06 +02:00
Philippe Teuwen 3771c150f0 make style 2019-08-13 17:42:03 +02:00
Philippe Teuwen 763c94334b add missing includes and fix mf1ksim usage in hf_colin standalone mode 2019-08-13 17:39:48 +02:00
cjbrigato 961f98c125 SPIFFS : FIXES FS corruption against high numbero f current losses, high number of files manipulation. FIXES LOG_BLOCK erasing handlers. FIXES Garbage Collector. Overall, SPIFFS should now be WAY MORE resilient to any form of misbehavior. In case of corrupted filesystem (should still be readable !), spamming 'mem spiffs check' from the client will ensure at least 2 new free 4k blocks each tile (if number of LOG_PAGE available is enough) and in the same pass will move/reorganize the LOG_PAGES of contextual blocks. Yiha 2019-08-13 17:39:48 +02:00
Philippe Teuwen d19754567d summer restructuring: 
* .h include only the strict minimum for their own parsing
  * this forces all files to include explicitment their needs and not count on far streched dependencies
  * this helps Makefile to rebuild only the minimum
  * according to this rule, most standalone .h are now gone
  * big app.h is gone
  * remove seldom __cplusplus, if c++ happens, everything will have to be done properly anyway
* all unrequired include were removed
* split common/ into common/ (client+arm) and common_arm/ (os+bootloader)
  * bring zlib to common/
  * bring stuff not really/not yet used in common back to armsrc/ or client/
  * bring liblua into client/
  * bring uart into client/
  * move some portions of code around (dbprint, protocols,...)
* rename unused files into *_disabled.[ch] to make it explicit
* rename soft Uarts between 14a, 14b and iclass, so a standalone could use several without clash
* remove PrintAndLogDevice
* move deprecated-hid-flasher from client to tools
* Makefiles
  * treat deps in armsrc/ as in client/
  * client: stop on warning (-Werror), same as for armsrc/

Tested on:

* all standalone modes
* Linux
 2019-08-11 21:42:01 +02:00
Philippe Teuwen 12d38bb6ac fix standalones after Mifare1ksim changes 2019-08-07 11:57:26 +02:00
Philippe Teuwen a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
iceman1001 2400418067 style 2019-08-01 11:15:39 -04:00
Iceman 759ba4056e
Merge pull request #299 from cjbrigato/master 
HF_COLIN 2/3 : Now able to read Known  key schemes from SPIFFS JSON Config File
 2019-08-01 15:47:29 +02:00
Philippe Teuwen f276dca3f1 less hardcoded sizes and more ARRAYLEN 2019-07-31 23:45:17 +02:00
cjbrigato 902f520bce HF_COLIN: Now works with shemas.json, an array of schemes, dynamically loaded at runtime 2019-07-31 08:12:49 +02:00
cjbrigato 23e9a3af34 HF_COLIN: Add example json scheme file 2019-07-31 01:36:58 +02:00
cjbrigato 3878f62168 HF_COLIN : Now able to read Known Mifare 1K key schemes from JSON Conf file from SPIFFS. BEWARE : DO NOT USE : Very Messy and early implementation 2019-07-31 01:32:16 +02:00
Philippe Teuwen 1229b358aa clarify standalone table 2019-07-24 19:32:06 +02:00
Philippe Teuwen 7093fdaa5d
Merge pull request #287 from cjbrigato/master 
HF_COLIN : Makes Known Schemes in Struct form
 2019-07-24 13:41:10 +02:00
Philippe Teuwen 4abb4b939f Proper Makefile halting when using incompatible Standalone mode and Platform 2019-07-24 13:37:56 +02:00
cjbrigato e20d1ab7d2 HF_COLIN : Known Schemes now are in Struct form. This is 1/2 Pass for having Schemes dynamicly read from SPIFFS as json. 2019-07-24 01:42:33 +02:00
Philippe Teuwen 7d51f9f266 fix hf_bog standalone mode compilation 2019-07-24 01:04:06 +02:00
cjbrigato 719c7fe314 HF_BOG make style 2019-07-24 00:21:35 +02:00
cjbrigato 6614995256 HF_BOG make style 2019-07-24 00:20:00 +02:00
Colin J. Brigato e59e0f6194
Typo 2019-07-23 23:42:48 +02:00
cjbrigato d3633b719f FIX: Patch HF_BOG standalone for new SPIFFS compatibility 2019-07-23 23:27:35 +02:00
cjbrigato aeed5e3c26 FIX: Patch HF_BOG standalone for new SPIFFS compatibility 2019-07-23 23:26:26 +02:00