13146 Commits

Author SHA1 Message Date
tharexde
bb04832b9d first version of 4x50_eload and 4x50_esave 2020-10-30 00:41:45 +01:00
tharexde
18326934d6 compact address assignment 2020-10-29 23:12:46 +01:00
iceman1001
748f067143 text 2020-10-29 21:48:58 +01:00
iceman1001
55f913381c text 2020-10-29 21:46:46 +01:00
iceman1001
7cea1bcbf8 text 2020-10-29 19:51:26 +01:00
iceman1001
81db8c4f77 fix: hf mf autopwn, darkside now works 2020-10-29 19:46:32 +01:00
iceman1001
fd6dda5e36 cident - verify rats has size and empty buffers before 2020-10-29 12:26:43 +01:00
Iceman
5154a28ce3 Merge pull request #1037 from ikarus23/master
Fixed comment in MIFARE Classic dictionary.
2020-10-29 12:02:41 +01:00
ikarus
5536847207 fixed comment in MIFARE Classic dictionary. 2020-10-29 11:56:56 +01:00
iceman1001
6391a9ab00 fix: run gen3 on non MFC 2020-10-29 10:54:22 +01:00
iceman1001
e52b7c2139 fix: bad identification of some gen2 2020-10-29 10:53:34 +01:00
iceman1001
0e4f5f4865 fix #1036 , wrong offset used. Thanks @xianglin1998 2020-10-29 10:29:03 +01:00
tharexde
4c95c16e54 address has to be inserted twice, otherwise loop from for -> lwr fails, since lwr is 0 2020-10-29 00:23:14 +01:00
tharexde
eefb8b82b9 use of already existing function in util.c 2020-10-29 00:01:15 +01:00
tharexde
236e3f82d8 4x50_sim: options 'u' and 'f' can not be used at the same time 2020-10-28 12:41:28 +01:00
Iceman
6c627f6b7b Merge pull request #1015 from VortixDev/mifare_detect
Improve MIFARE type identification
2020-10-28 10:57:12 +01:00
iceman1001
127882ca70 textual 2020-10-28 10:41:44 +01:00
Philippe Teuwen
5a86a7757b tune em 4x05_info 2020-10-28 01:54:59 +01:00
Philippe Teuwen
a45bb684f4 tune support for EM4369 & EM4469 2020-10-28 00:39:41 +01:00
Philippe Teuwen
fdd11c3fb2 Fix MAD decoding for DESFire 2020-10-27 20:46:51 +01:00
tharexde
140037d9f0 Adaptation of the implementation of read function to that currently used in master branch 2020-10-27 19:16:54 +01:00
iceman1001
fce8da584a textual 2020-10-27 18:54:19 +01:00
iceman1001
89f305b842 forgot header file 2020-10-27 18:52:11 +01:00
iceman1001
52164a4fd1 hf 14b sriread -> hf 14b rdbl, renamed and refactored it to read a block. use dump, to dump whole tag 2020-10-27 18:26:14 +01:00
tharexde
ce5181bdc9 added std_read command for em4x50 2020-10-27 18:18:02 +01:00
iceman1001
4c4f1b228f Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-27 17:19:54 +01:00
iceman1001
de2f64eb8e 14b sriwrite - adapt to new raw parser 2020-10-27 17:19:46 +01:00
Philippe Teuwen
66d5181a82 dfev3 pk 2020-10-27 10:30:19 +01:00
Philippe Teuwen
c046ac3d50 dfev3 pk 2020-10-27 10:26:36 +01:00
tharexde
0a41049bf6 adjusted descriptions 2020-10-27 01:09:19 +01:00
tharexde
e63a40e5b6 added file upload for sim function 2020-10-27 00:53:50 +01:00
tharexde
d6471f2231 Merge branch 'master' into allin
update
2020-10-26 22:20:32 +01:00
tharexde
eee2540e85 adjustments regarding em4x50 (hopefully it works...) 2020-10-26 22:14:18 +01:00
tharexde
d034d640fc added simple sim functionality for em4x50 (+ some minor corrections) 2020-10-26 22:13:07 +01:00
tharexde
2b5e8f358e added simple sim function for em4x50 ( + some minor corrections) 2020-10-26 22:11:57 +01:00
tharexde
96e05d49df added simple sim function for em4x50 2020-10-26 22:10:48 +01:00
tharexde
c1f5fc546d added import for em4x50 2020-10-26 14:35:09 +01:00
tharexde
3a698dfc0c reorder of file types (if extension is neither bin nor eml -> json is assumed) 2020-10-26 14:34:40 +01:00
tharexde
bc87a6edf2 addded JSON import support for 4x50_restore 2020-10-26 14:04:39 +01:00
tharexde
9af388c1e1 added EM4x50 JSON export 2020-10-26 13:30:25 +01:00
Iceman
c0c6c04e92 Merge pull request #1034 from xianglin1998/master
Android libpm3 updated.
2020-10-26 10:02:05 +01:00
iceman1001
d7d809a8e3 remove extra parenthesis 2020-10-26 10:00:44 +01:00
dxl
caafbe27c7 Some file already deleted or renamed. 2020-10-26 16:30:05 +08:00
dxl
229c1053c0 delete some text. 2020-10-26 16:28:41 +08:00
DXL
8d2021e0cb Merge pull request #6 from RfidResearchGroup/master
Update from upstream.
2020-10-26 10:19:01 +08:00
iceman1001
57f226c922 smart upgrade - now uses NG, added crc for each transfer to verify data integrity before flashing 2020-10-26 00:38:13 +01:00
tharexde
3ce365ee2b Merge branch 'master' into allin
update
2020-10-26 00:31:27 +01:00
tharexde
82c2f79dd0 dump function indicates use of tag UID in filename but takes device serial -> changed to UID 2020-10-26 00:22:11 +01:00
tharexde
e834c30f6b added eml file format support for restoring 2020-10-26 00:14:37 +01:00
tharexde
b3b6f827e8 no comment necessary 2020-10-26 00:12:52 +01:00