Commit graph

6904 commits

Author SHA1 Message Date
tharexde 18326934d6 compact address assignment 2020-10-29 23:12:46 +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
tharexde 140037d9f0 Adaptation of the implementation of read function to that currently used in master branch 2020-10-27 19:16:54 +01:00
tharexde ce5181bdc9 added std_read command for em4x50 2020-10-27 18:18:02 +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 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
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 86007bfdd4 replaced command parameter: a <addr> -> b <block> and w <word> -> d <data> 2020-10-25 22:01:52 +01:00
tharexde 881bdbf456 added new function 4x50_restore 2020-10-25 16:39:22 +01:00
tharexde 8ca8c307ad added new function 4x50_restore + unified cosmetic adaptions 2020-10-25 16:39:10 +01:00
tharexde 10aabebec5 added new function 4x50_restore 2020-10-25 16:37:55 +01:00
iceman1001 bc48941951 fix smart card 2020-10-25 01:12:20 +02:00
Philippe Teuwen e9b55acd00 typos 2020-10-24 19:50:14 +02:00
iceman1001 8f954ebf9d refactor continuous mode 2020-10-24 11:56:47 +02:00
Philippe Teuwen fcc70f7536 Add continuous mode for hf 14a reader 2020-10-24 01:18:51 +02:00
iceman1001 f11bc85a34 no spaces 2020-10-24 00:23:05 +02:00
iceman1001 34148b0383 fix https://github.com/RfidResearchGroup/proxmark3/issues/1029 2020-10-23 10:00:47 +02:00
Philippe Teuwen ceb709a512 typos 2020-10-23 01:31:33 +02:00
Philippe Teuwen 18a6d3e92a typos 2020-10-23 01:24:58 +02:00
iceman1001 6ffcc827a8 visual helptext 2020-10-22 22:16:44 +02:00
iceman1001 452ad19bb9 fix https://github.com/RfidResearchGroup/proxmark3/issues/1028 2020-10-22 17:44:37 +02:00
tharexde e1b3cbfc9f will have a closer look at this later... 2020-10-22 15:09:09 +02:00
tharexde 6dc4ed3301 syntax error 2020-10-22 15:07:36 +02:00
iceman1001 74760c6de6 hf lto dump / info - now adapts to different type_info 2020-10-22 12:20:39 +02:00
mwalker33 b94e4d927e Update cmdlfem4x.c
Show clock reate for EM4100 tags
2020-10-22 10:09:50 +02:00
tharexde 069018e72a Merge branch 'master' into allin
update
2020-10-22 01:01:59 +02:00
tharexde a04002ab1b redesign 2020-10-22 00:42:18 +02:00
iceman1001 085d7c6cc5 remove dublicate calls (thanks @doegox) 2020-10-22 00:05:44 +02:00
iceman1001 534fc5071b lf em 4x05_info - add known configuration identification 2020-10-21 14:03:36 +02:00
iceman1001 6c4b629547 em4x05 - psk detection improvement 2020-10-21 13:29:45 +02:00
iceman1001 ea6ac60726 renames 2020-10-21 13:26:28 +02:00
iceman1001 1732242ca4 only convert if there actually was a hexstring 2020-10-21 13:25:29 +02:00
Philippe Teuwen edda8adbc5 cmake: Add ISOC99 to cliparser for %zu 2020-10-21 10:02:32 +02:00