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

249 commits

Author SHA1 Message Date
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
Philippe Teuwen 9beabaabf5 make style 2019-07-23 21:33:52 +02:00
cjbrigato 5c3676ad81 ADD: Early SPIFFS implementation see #257, UPDATE HF_COLIN accordingly 2019-07-22 22:56:06 +02:00
Philippe Teuwen 8281d3a384 Fix hf_mattyrun bug introduced in 732bc766f9 2019-07-16 22:47:34 +02:00
Philippe Teuwen 48279e85d9 Fix hf_colin standalone broken by recent include files reorganization 2019-07-16 19:31:59 +02:00
Philippe Teuwen 710b38f209 Move Makefile standalone stuff to armsrc/Standalone for easier access 2019-07-16 19:18:54 +02:00
merlokk bd8824a2f3 make style 2019-07-16 16:10:11 +03:00
Philippe Teuwen ed4289d462
Merge pull request #251 from merlokk/reorg_includes 
added PACKED attribute for structures and reorganize include folder
 2019-07-16 14:52:14 +02:00
merlokk 20d13d5509 added PACKED attribute for structures and reorganize include folder 2019-07-16 14:50:38 +03:00
Philippe Teuwen b845404f39 Remove misplaced comment 2019-07-15 22:28:18 +02:00
Philippe Teuwen 0ea7fa7784 buggy 'mem read' removed, 'mem save' renamed 'mem dump', can now display too 2019-07-15 12:57:20 +02:00
Colin J. Brigato 2fc26fbf35
HF_COLIN/STANDALONE: FIX Simulation/Writing Tag to flash/Reading back from flash 
* Simulation was broke by the 4/7/10 UID lenght pseudo-support (which, in regard of the whole, will never be of any use unless complete reimplementaiton). Kept this part as respect, but enforced UID_IN_EMUL, since it will _ALWAYS_ be the case, be it direct simulation after tag breaking or from reading back tag.
* Writing tag was broken when flashmem driver had SPI settings changed, enforcing 48MHz speed as necessity for some work (like in hf_bog), so now it is
* Reading back, however, should absolutely be done at 24Mhz to avoid those unecessary and unstable [On this chip] FAST_READS.

Should worsk flawlessly now.
If one has spare time, handling getting new keys or defining whole Schemes in Flashmem would be perfect. Just has to be a conditional and a 8/16key ordered answer.
 2019-07-14 13:29:40 +02:00
Philippe Teuwen aab0558a58 minor txt alignments 2019-07-09 22:49:57 +02:00
Iceman ca9ed6f691
Update readme.md 2019-06-17 09:38:50 +02:00
Philippe Teuwen 1ebfa897c8 remove some cppcheck warnings 2019-06-12 06:41:23 -07:00
Philippe Teuwen a55e597e36 make style 2019-06-07 21:40:33 +02:00
Philippe Teuwen 732bc766f9 Reduce some var scopes 2019-06-07 18:41:39 +02:00
Philippe Teuwen 4761ea13f7 MF_DBGLEVEL => DBGLEVEL (pm3 side) 2019-06-06 10:05:09 +02:00
Philippe Teuwen 3b12ba2e93 replace usb_poll_validate_length() by data_available() that supports USART too 2019-06-03 00:01:08 +02:00
Philippe Teuwen fe9e1dc733 remap LEDs 2019-06-02 11:47:10 +02:00
iceman1001 5a80490d43 fix: skeleton compiles 2019-06-01 09:36:15 -04:00
Philippe Teuwen e98c4e246d rework standalone makefile 2019-06-01 00:23:38 +02:00