RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-09-19 11:06:37 +08:00
Code Issues Projects Releases Packages Wiki Activity
6484 commits 3 branches 18 tags 91 MiB
Commit graph

1732 commits

Author SHA1 Message Date
mwalker33
9085465c38 Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-25 21:00:41 +10:00
mwalker33
3211f35062 Added set default timings 2019-07-25 21:00:30 +10:00
mwalker33
b222161941
Merge branch 'master' into master 2019-07-25 20:12:00 +10:00
mwalker33
77d96ff3b7 Bug Fix Timing order 
Timing for backward compatibility
 2019-07-25 20:01:03 +10: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
Philippe Teuwen
a92560ff13
Merge pull request #286 from cjbrigato/master 
HF_BOG fixes for spiffs
 2019-07-24 00:59:49 +02:00
Philippe Teuwen
c0eb19acb1 remove tabs 2019-07-24 00:52:24 +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
mwalker33
b16f2fdaba Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-24 08:15:38 +10:00
mwalker33
cdc3787008 clean 2019-07-24 08:12:25 +10:00
Philippe Teuwen
ac233a346a make style 2019-07-23 23:43:30 +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
11e5131604
Merge pull request #284 from mwalker33/master 
T55x7 Downlink mode support added
 2019-07-23 22:42:47 +02:00
Philippe Teuwen
7f57879e45 typo 2019-07-23 21:48:09 +02:00
Philippe Teuwen
544fb30ce6 typos 2019-07-23 21:40:01 +02:00
Philippe Teuwen
9beabaabf5 make style 2019-07-23 21:33:52 +02:00
mwalker33
5de04f84e9 Restored * 8 
Revert back to store and use the full value (*8) for the timing.
 2019-07-23 20:12:05 +10:00
mwalker33
4e0e69ed63 Added T55 downlink mode support 2019-07-23 09:50:28 +10:00
cjbrigato
5c3676ad81 ADD: Early SPIFFS implementation see #257, UPDATE HF_COLIN accordingly 2019-07-22 22:56:06 +02:00
McEloff
0189bb70d7
Merge branch 'master' into mf_sim_ac_fix 2019-07-19 16:32:45 +03:00
Eloff
0b38c23ed3 'hf mf sim' - wrong access rights to write key B in trailer; typo; simple code optimization 2019-07-19 16:27:08 +03:00
Philippe Teuwen
8e6258936c make style 2019-07-19 13:18:35 +02:00
merlokk
6e15d6521d Merge branch 'master' of github.com:merlokk/proxmark3i into apdu_armside 2019-07-18 17:44:50 +03:00
merlokk
e87abc9681 small fix apdu leds 2019-07-18 17:32:56 +03:00
merlokk
1e0433c1d7 now code can't use uninitialized fpga link and encoders/decoders 2019-07-18 17:11:04 +03:00
merlokk
87e183e664 small fix 2019-07-17 16:26:10 +03:00
merlokk
81fa3f20df speed optimization 2019-07-17 16:22:14 +03:00
merlokk
67ad6298cd added 14a send/receive arm timeout 2019-07-17 15:54:22 +03: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
d8763509de Add 'hw standalone' to jump to standalone mode from command line or script 2019-07-15 22:31:19 +02: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
Iceman
23160f20cb
Merge pull request #244 from cjbrigato/patch-1 
HF_COLIN/STANDALONE: FIX Simulation/Writing Tag to flash/Reading back…
 2019-07-15 11:40:24 +02:00
Iceman
7aabab2462
Merge pull request #242 from slurdge/remove_aes_c 
Remove aes.c in favor of mbedtls implementation.
 2019-07-15 09:02:07 +02:00
Philippe Teuwen
2209a0c00d BUSY_TIMEOUT for mem wipe was too short, thanks @cjbrigato 2019-07-15 01:13:11 +02:00
Iceman
9196bdc670
Merge pull request #245 from McEloff/hf_mf_sim_auth_nack 
hf_mf_sim. Really tags not respond NACK on invalid authentication
 2019-07-14 22:48:04 +02:00
Eloff
a28e359095 Fix. More flexible anti-collision frame check 2019-07-14 23:18:07 +03:00
Eloff
f6f7e7a9f6 hf_mf_sim. Really tags not respond NACK on invalid authentication 2019-07-14 23:12:39 +03:00