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

197 commits

Author SHA1 Message Date
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
iceman1001
cd9092c58a fix: VIGIKPWN - use 10/7/4 uid (@McEloff) 2019-05-23 03:44:06 -04:00
iceman1001
bb45aad212 fix: mattyrun - use 10/7/4 uid (@McEloff) 2019-05-23 03:40:01 -04:00
iceman1001
4b89938dcd fix: standalone mode VIGIKPWN now compiles 2019-05-23 03:11:05 -04:00
iceman1001
e5a9e31b9f fix: standalone mode VIGIKPWN now compiles 2019-05-23 03:11:01 -04:00
iceman1001
81053d8c42 fix: standalone mode mattyrun now compiles 2019-05-23 03:03:24 -04:00
Philippe Teuwen
e7a464f5e7 hf_colin: fix colors compilation 2019-05-23 00:40:23 +02:00
Philippe Teuwen
522297896c Use GetTickCountDelta everywhere 2019-05-23 00:39:50 +02:00
iceman1001
a4f4104075 textual 2019-05-18 17:53:08 +02:00
Philippe Teuwen
2497ec2eec More USB_CMD -> PM3_CMD 2019-05-04 11:36:35 +02:00
Gtpy
584a346587
Missing Rename USB -> PM3 
Missing Rename USB -> PM3 to avoid misleading interpretations 27f7057
 2019-05-03 16:57:56 +02:00
Philippe Teuwen
63cd4a9fbb Merge branch 'better_color_handling' 
* better_color_handling:
  Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed
  Use PrintAndLogEx in flasher
  Simplify color & banner logic
  Smart color handling:
 2019-04-30 21:37:19 +02:00
Philippe Teuwen
27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
Philippe Teuwen
0a4b90ac20 Simplify color & banner logic 2019-04-30 13:02:27 +02:00
iceman1001
ab6870c573 style 2019-04-28 11:08:41 +02:00
Philippe Teuwen
1c136c8fc6 Merge branch 'master' into experimental_varlen 
* master:
  rework Dbprintf & add color support
  use color macros
  doc magic
  archive and fix hid-flasher
  update standalone readme
 2019-04-26 10:48:28 +02:00
Philippe Teuwen
cb452c98ba rework Dbprintf & add color support 2019-04-26 10:36:06 +02:00
Philippe Teuwen
9a6ad6597f update standalone readme 2019-04-25 23:40:51 +02:00
Philippe Teuwen
c22da12502 Merge branch 'master' into experimental_varlen 
* master:
  Update readme.md
  Update readme.md
  Update readme.md
  remove redundant def
 2019-04-25 23:33:52 +02:00
Iceman
839a0ef9fb
Update readme.md 2019-04-25 23:23:44 +02:00
Iceman
1e797e1720
Update readme.md 2019-04-25 23:20:54 +02:00
Iceman
f90b04d4cf
Update readme.md 2019-04-25 23:20:33 +02:00
Philippe Teuwen
540fecb760 Merge branch 'master' into experimental_varlen 
* master:
  adjust standalone doc
  Use placeholder for standalone mode if needed
  Move compile options to Makefile.hal
  textual
  chg: refactor standalone mode info string add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
 2019-04-25 23:01:49 +02:00
Philippe Teuwen
423e6bfb32 adjust standalone doc 2019-04-25 22:43:08 +02:00
Philippe Teuwen
c616f47d6b Use placeholder for standalone mode if needed 2019-04-25 22:40:46 +02:00
Philippe Teuwen
5d6f2c641b Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  textual
  chg: refactor standalone mode info string add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
 2019-04-25 22:25:10 +02:00
Philippe Teuwen
f3b3508d3e Move compile options to Makefile.hal 2019-04-25 22:15:16 +02:00
iceman1001
505506c5dd textual 2019-04-25 21:50:55 +02:00
iceman1001
7220653ccd chg: refactor standalone mode info string 
add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
 2019-04-25 21:44:34 +02:00
Philippe Teuwen
e7e07d9096 Merge branch 'master' into experimental_varlen 
* master:
  fix:  spellingmistake
  REM: removed unused define
 2019-04-25 21:26:51 +02:00
iceman1001
176645b9fc REM: removed unused define 2019-04-25 21:16:11 +02:00
Philippe Teuwen
79d7fb65b5 Merge branch 'master' into experimental_varlen 
* master:
  Fix segfault when loading a file
  Revert c7a4d7af, remove redundant include
 2019-04-24 00:59:57 +02:00
Philippe Teuwen
127f5ed192 Revert c7a4d7af, remove redundant include 2019-04-22 22:11:57 +02:00
Philippe Teuwen
7331b7d6d2 Merge branch 'master' into experimental_varlen 
* master:
  Add ref to new mifaresim.h in standalone modes
  fix: Standalone/hf_colin now compiles
  Update readme.md
  chg: hitag compile flag optional
  fix: standalonemode matty_run now compiles
  typo
  smallfix
  chg: fpga lf simulation
  chg: 'fpga lf sim' - 25% both on sides.
 2019-04-19 23:17:36 +02:00
Philippe Teuwen
c7a4d7af3a Add ref to new mifaresim.h in standalone modes 2019-04-19 23:15:02 +02:00
Philippe Teuwen
c4766b2649 Semi-Automated SendCommand -> SendCommandOLD 2019-04-19 23:01:13 +02:00
iceman1001
a82fd7da34 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-19 10:00:09 +02:00
iceman1001
b495f4bc44 fix: Standalone/hf_colin now compiles 2019-04-19 09:59:34 +02:00
Iceman
05674dc559
Update readme.md 2019-04-19 09:29:50 +02:00
iceman1001
9c776c8935 fix: standalonemode matty_run now compiles 2019-04-19 09:23:02 +02:00
Philippe Teuwen
9b4896225c SendCommandOLD for hf_young 2019-04-19 01:14:33 +02:00
Philippe Teuwen
482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
iceman1001
af54eb5138 unused 2019-04-09 18:06:19 +02:00
Philippe Teuwen
a7448f802f make style: don't indent preprocessor directives 2019-04-07 12:10:51 +02:00
iceman1001
91897f1f2e copy bytes 2019-04-07 12:06:48 +02:00
iceman1001
c9b3dd32d1 remove random 2019-04-07 11:00:28 +02:00
iceman1001
db78d26b9f styles 2019-04-07 10:33:34 +02:00
iceman1001
da7dc2353c style and warnings 2019-04-07 10:30:52 +02:00
iceman1001
aea6c6d3c5 fixes, shadow 2019-04-07 10:17:43 +02:00
Philippe Teuwen
26eb54b965 style 2019-04-06 01:00:54 +02:00
iceman1001
1773cfcf39 style 2019-04-05 18:51:19 +02:00
iceman1001
ca9061bd32 changed byte_t -> uint8_t 2019-03-21 15:19:18 +01:00
iceman1001
4706d27903 reassigned 2019-03-18 20:11:19 +01:00