RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 07:46:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
9778 commits 3 branches 14 tags 86 MiB
Commit graph

9778 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tharexde b9daec24f2 Merge branch 'master' into dev_em4x50_info_write 
update
 2020-06-16 00:18:49 +02:00
Iceman 8f4db5eae0
Merge pull request #792 from tharexde/fix_em4x50 
Fix em4x50
 2020-06-15 20:51:56 +02:00
merlokk 141c75bfb3 a1 2020-06-15 18:51:45 +03:00
tharexde db9e024913 new entry regarding em4x40 demodulation 2020-06-15 14:41:42 +02:00
tharexde c1bb030876 Merge remote-tracking branch 'upstream/master' 
update
 2020-06-15 14:35:14 +02:00
tharexde ef9ccde512 added EM4x50 info function 2020-06-15 14:32:51 +02:00
tharexde f5ff2c12eb added EM4x50 info function 2020-06-15 14:32:44 +02:00
tharexde 1fe83eaf25 added EM4x50 info function 2020-06-15 14:32:34 +02:00
tharexde ffec9d5a18 added EM4x50 info function 2020-06-15 14:32:23 +02:00
tharexde e707ceb906 added EM4x50 info function 2020-06-15 14:32:11 +02:00
tharexde 2b1bfc58f9 added EM4x50 info function 2020-06-15 14:31:43 +02:00
tharexde 79b20a35c1 added EM4x50 info function 2020-06-15 14:31:34 +02:00
tharexde dfe6941a8d added EM4x50 info function 2020-06-15 14:31:27 +02:00
tharexde 6cd927d6d4 added EM4x50 info function 2020-06-15 14:31:15 +02:00
tharexde 1adc0de21d added EM4x50 info function 2020-06-15 14:30:50 +02:00
tharexde b99f7213e8 added EM4x50 info function 2020-06-15 14:30:18 +02:00
Philippe Teuwen d75073590f doc: minor 2020-06-15 14:26:43 +02:00
Philippe Teuwen 7335d16cdb Makefile-vs-CMake.md 2020-06-15 14:11:54 +02:00
tharexde 4d292d3ca0 fixed: first bit of em4x50 word was skipped in case of a "0" -> first transition in raw Manchester decoding is now taken into account 2020-06-14 14:51:48 +02:00
iceman1001 62ce1cdf13 chg: increase stack size - hf mfu simlation needs it 2020-06-14 12:16:27 +02:00
iceman1001 4c2483cd3f helptext 2020-06-14 11:05:43 +02:00
iceman1001 4f50591784 chg; pages is not offset 2020-06-14 10:47:40 +02:00
iceman1001 fef8ef6aa4 chg: fileutils tries to add pack when converting old -> new dump format 2020-06-14 08:17:10 +02:00
iceman1001 aeb8e5beb7 chg, "hf mf eload" - uses same dump printer 2020-06-14 08:16:19 +02:00
iceman1001 88a42c6108 chg: ntag215/amiibo, empty header, use hardcoded values 2020-06-14 07:41:21 +02:00
Bjoern Kerler 70933c359d
Merge pull request #6 from RfidResearchGroup/master 
Update
 2020-06-13 20:02:39 +02:00
Iceman e0eaff453f
Merge pull request #787 from bkerler/DesAuth 
Mifare Des authentification fixes
 2020-06-13 18:26:23 +02:00
iceman1001 675da483ad link 2020-06-13 18:07:03 +02:00
iceman1001 ae36cc6e1b color document 2020-06-13 18:05:31 +02:00
Bjoern Kerler e7b2dbd5e8 Remove unnecessary crc 2020-06-13 17:58:47 +02:00
iceman1001 a9bfcb015c style 2020-06-13 17:49:33 +02:00
Bjoern Kerler 6f336832da Add Changelog 2020-06-13 17:20:48 +02:00
Bjoern Kerler 9a07c06596 Fix htole32 issue 2020-06-13 17:16:17 +02:00
Bjoern Kerler 0b204f5d1d Merge branch 'DesAuth' of https://github.com/bkerler/proxmark3 into DesAuth 2020-06-13 16:55:45 +02:00
Bjoern Kerler b0d969da24 Fix unsigned vs. signed 2020-06-13 16:55:30 +02:00
Bjoern Kerler 1ca5706c59
Merge pull request #5 from RfidResearchGroup/master 
Update
 2020-06-13 15:12:16 +02:00
Bjoern Kerler 631be7af32 Fixes 2020-06-13 15:11:10 +02:00
Philippe Teuwen 797fa7d01a Tolerate exit-like calls from embedded Python script 
Now sys.exit(0) is silently accepted, while
quit() / raise SystemExit / sys.exit() / sys.exit(n) / exit()
will output sth a warning such as
"Script terminated by SystemExit -1"

Still, don't call os._exit(0), it immediately exits.
 2020-06-13 14:53:47 +02:00
Bjoern Kerler e0bf636aaf Make style 2020-06-13 14:25:40 +02:00
Bjoern Kerler 5adc8e876a Fix DES authentification and format picc 2020-06-13 14:19:21 +02:00
Philippe Teuwen 494a28da1c
Merge pull request #784 from HeroCC/patch-1 
Additional CharlieCard Key
 2020-06-13 11:15:50 +02:00
Conlan e8c88d47ef
Additional CharlieCard Key 2020-06-12 20:01:55 -04:00
Philippe Teuwen 25fb6df229 Android cross-compilation to client cmake 2020-06-12 23:28:38 +02:00
iceman1001 94403bee59 textual 2020-06-12 22:49:42 +02:00
iceman1001 2bb110fef3 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-06-12 22:35:18 +02:00
iceman1001 9c6ce5be50 chg: "hf mf cwipe" - speed up using backdoor wipe cmd 2020-06-12 22:35:08 +02:00
Philippe Teuwen 020c6882ce colors 2020-06-12 19:52:13 +02:00
Philippe Teuwen 8c5be2678f Yet another color management, settings autodetection done earlier 2020-06-12 19:45:18 +02:00
Philippe Teuwen 30c0345c31 Fix fix colors 2020-06-12 18:21:03 +02:00
Philippe Teuwen bb5c588935 Fix colors detection under Windows (when no ref & when redirected IOs) 2020-06-12 18:17:39 +02:00