RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-14 19:24:10 +08:00
Code Issues Projects Releases Packages Wiki Activity
6949 commits 3 branches 15 tags 87 MiB
Commit graph

1820 commits

Author SHA1 Message Date
Philippe Teuwen
4a3fb3ccf1 split nfcbarcode from iso14443a 2019-08-03 22:14:12 +02:00
Philippe Teuwen
517f0886ba make style 2019-08-03 20:20:08 +02:00
Iceman
f08649ac0e
Merge pull request #304 from ViRb3/format-and-docs 
Format and docs
 2019-08-03 19:53:49 +02:00
Philippe Teuwen
a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
Victor
5913ee670a Add auth comments 2019-08-03 18:36:47 +01:00
Victor
835a8a3b03 Add state comments 2019-08-03 18:36:47 +01:00
Victor
4bd03bb920 Fix more comment alignment 2019-08-03 18:36:47 +01:00
Victor
868469db0d Fix comment alignment 2019-08-03 18:36:47 +01:00
Iceman
87e300588b
Merge pull request #303 from ViRb3/fix-pass-write 
Fix password write offset by 1
 2019-08-03 19:34:10 +02:00
Victor
714280fad2 Fix password write offset by 1 2019-08-03 17:57:39 +01:00
iceman1001
65feeeafc8 chg: 'lf t55xx deviceconfig - a compact output' 2019-08-03 18:48:08 +02:00
iceman1001
0320455090 chg 'lf t55xx deviceconfig - color adaptations 2019-08-03 09:53:08 -04:00
iceman1001
f643a7a5a4 chg: 'lf t55xx deviceconfig' - matrix styled output 2019-08-03 15:26:46 +02:00
Philippe Teuwen
5061869efd help iceman reverting last 2019-08-03 10:57:59 +02:00
iceman1001
bf2dc0304b revert last 2019-08-03 04:43:01 -04:00
Philippe Teuwen
96ed907605 Fix momentarily flash read/write of dicts 2019-08-02 20:48:44 +02:00
Philippe Teuwen
865a7c3ad4 Add thinfilm simulation 2019-08-02 00:26:07 +02:00
Philippe Teuwen
85c0f3e9e3 thinfilm partial info when verbose 2019-08-01 17:49:35 +02:00
iceman1001
2400418067 style 2019-08-01 11:15:39 -04:00
Philippe Teuwen
118c8478f0 fix ManchesterDecoding_Thinfilm (msb was always forced to 0) 2019-08-01 16:55:20 +02: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
iceman1001
fbff51c88d Add: hf thinfilm info - support to read and decode Kovio Thinfilm NCT tags 2019-08-01 09:39:33 -04:00
iceman1001
f6befc235f chg: macro SRC_SPIFFS is dependent of WITH_FLASH 2019-08-01 00:51:53 -04:00
Colin J. Brigato
b4e004abc2
Off by one in GetTickCountDelta (FIXes #301) 
FIXes #301 and prevent a `-1`aka`UINT_MAX` delta.
 2019-08-01 01:56:30 +02:00
Philippe Teuwen
733a7d836d more ARRAYLEN 2019-08-01 00:14:09 +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
c83ff9da0f make style 2019-07-28 19:24:00 +02:00
iceman1001
9f4620c92c make style 2019-07-27 17:48:52 -04:00
iceman1001
283060f962 chg: renaming a struct 2019-07-27 21:15:43 +02:00
iceman1001
c951e54ff2 chg: 'lf t55xx deviceconfig' - change text when not configured 2019-07-27 10:06:38 +02:00
iceman1001
548c2ed998 make style 2019-07-27 03:54:01 -04:00
iceman1001
b4eb41ee66 chg: 't55' more style 2019-07-27 09:50:24 +02:00
iceman1001
a597382530 chg: 't55' - adapting to codestyle, added some colors to message outputs, change comments 2019-07-27 09:36:16 +02:00
Philippe Teuwen
f44343aa20
Merge pull request #288 from mwalker33/master 
Bug Fix : T55x7 timings save to flash
 2019-07-25 13:25:14 +02:00
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
Philippe Teuwen
6c1ff4cef7 minor alignment 2019-07-25 12:22:24 +02: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
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
b0dbbd3683 make style 2019-07-13 00:38:30 +02:00
slurdge
996ed197fb Remove aes.c in favor of mbedtls implementation. 
Changelog
 2019-07-12 23:48:54 +02:00
Victor
cb45313981 Add hitag2 write password auth 2019-07-09 23:00:57 +01:00
Philippe Teuwen
aab0558a58 minor txt alignments 2019-07-09 22:49:57 +02:00
slurdge
71b70f4ffb Add compiler info for proxmark3 armsrc 2019-07-09 22:35:23 +02:00
Victor
6646c20ef3 Fix clock deadlock in hitag sniff 2019-07-04 11:28:43 +01:00
iceman1001
17f97abfcb fix: spurious chars because strlen doesnt count ending zero 2019-06-30 04:18:03 -04:00
Iceman
ca9ed6f691
Update readme.md 2019-06-17 09:38:50 +02:00
iceman1001
283cc8d12a convert NG 2019-06-13 12:28:30 -04:00
iceman1001
a48f2e232f convert NG 2019-06-13 12:23:25 -04:00
Philippe Teuwen
1ebfa897c8 remove some cppcheck warnings 2019-06-12 06:41:23 -07:00