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

7230 commits

Author SHA1 Message Date
tharexde eb501dc8a7 added missing adaptions due to changes in 4x50_info 2020-11-29 00:37:29 +01:00
Philippe Teuwen 59667e5d1b make style (linux) 2020-11-29 00:28:56 +01:00
Iceman dbc730468a
Merge pull request #1076 from tcprst/lto_cliparser 
hf lto dump, restore, info, rdbl, wrbl - now use cliparser
 2020-11-29 00:24:55 +01:00
tharexde 72b21f018e Merge branch 'master' into allin 
update 201129
 2020-11-29 00:22:09 +01:00
tcprst f28a169d0a
Merge remote-tracking branch 'upstream/master' into lto_cliparser 2020-11-28 18:13:00 -05:00
tcprst d3379593f2
hf lto - now uses cliparser 2020-11-28 18:07:46 -05:00
iceman1001 9b2fd29149 text 2020-11-28 23:54:58 +01:00
iceman1001 4d0e537ee3 maur pwds. ZX-Copy3 for T55xx / EM4305 2020-11-28 23:54:35 +01:00
tcprst 5b526522c7
hf lto rdbl - now use cliparser 2020-11-28 17:51:46 -05:00
tcprst 02637193f7
hf lto restore - now use cliparser 2020-11-28 17:42:35 -05:00
tcprst 7423c59c5f
hf lto info, dump - now use cliparser 2020-11-28 17:37:23 -05:00
iceman1001 ae04b07c13 optional 2020-11-28 22:19:25 +01:00
iceman1001 0ecefcfbf4 text 2020-11-28 22:18:23 +01:00
iceman1001 3dd4160c5a fix coverity 307506 - textual 2020-11-28 14:42:02 +01:00
iceman1001 1fa2654f15 hf iclass chk - textual 2020-11-28 13:47:05 +01:00
iceman1001 ddfca6b415 textual 2020-11-28 13:46:33 +01:00
iceman1001 4bb63577c6 iclass chk / lookup / loclass - speedups 2020-11-28 13:46:16 +01:00
Iceman 4f55b349df
Merge pull request #1072 from tcprst/iclass_cliparser 
hf iclass chk, managekeys, calcnewkey, lookup, sim - now use cliparser
 2020-11-28 12:01:34 +01:00
tcprst ee7ad062f2
minor bug fix 2020-11-27 21:23:28 -05:00
tcprst 448a0546b1
hf iclass sim - now use cliparser 2020-11-27 21:22:23 -05:00
tcprst a5ab00357d
hf iclass lookup - now use cliparser (untested) 2020-11-27 20:28:23 -05:00
tcprst 769e809104
hf iclass calcnewkey - now use cliparser 2020-11-27 19:51:54 -05:00
tcprst 4e1c1f96f8
hf iclass managekeys - now use cliparser 2020-11-27 18:27:02 -05:00
tcprst 1722d2cb43
hf iclass chk -now use cliparser 2020-11-27 15:46:06 -05:00
iceman1001 e581a662b4 maur 2020-11-27 21:41:21 +01:00
tharexde b18ded915a Merge branch 'master' into allin 
update 201127
 2020-11-27 21:24:33 +01:00
iceman1001 00f140683f lf keri - now supports continuous mode, EM (untested) 2020-11-27 19:41:25 +01:00
iceman1001 97b1562bad lf motorola - now uses cliparser, supports continuous mode, EM (untested) 2020-11-27 19:13:48 +01:00
iceman1001 e4bbd30f45 lf nexwatch - now uses cliparser, support continuous mode, EM (untested) 2020-11-27 17:54:34 +01:00
iceman1001 b2544faaf8 lf noralsy - now uses cliparser, contiuous mode, EM (untested) 2020-11-27 11:04:05 +01:00
iceman1001 edb70fe524 lf pac clone/sim - adapted output to always print cardid 2020-11-27 10:48:53 +01:00
iceman1001 026a3022dc solari 2020-11-27 09:39:36 +01:00
iceman1001 90509c6a82 lf pac - now uses cliparser, support continuous mode, and EM (untested) 2020-11-26 23:43:43 +01:00
iceman1001 3145a36a81 keys 2020-11-26 23:42:59 +01:00
iceman1001 966ecd6193 added lf paradox sim (experimental), lf paradox clone / reader - now uses cliparser, support continuous mode, EM (untested) 2020-11-26 20:09:20 +01:00
iceman1001 263215d242 text 2020-11-26 20:08:04 +01:00
iceman1001 a1e94a100a text 2020-11-26 20:07:39 +01:00
iceman1001 c59d6cdc71 lf presco - now uses cliparser, continuous mode and clone to EM (untested) 2020-11-26 19:42:24 +01:00
iceman1001 2e1c906d9e text 2020-11-26 07:07:33 +01:00
tcprst db083034d6
make style 2020-11-26 00:44:26 -05:00
tcprst 62196c7228
standardize argument types - hex,dec,etc 2020-11-26 00:34:30 -05:00
tcprst f723ed0386
hf iclass wrbl - now use cliparser 2020-11-26 00:11:54 -05:00
tcprst 5130bb24e2
hf iclass rdbl - now use cliparser 2020-11-25 21:16:08 -05:00
tcprst f4b100b068
show both decimal and hex for iclass blocks 2020-11-25 18:42:22 -05:00
tcprst 88b7efe69a
hf iclass restore - now use cliparser 2020-11-25 18:00:32 -05:00
tcprst 6b3f12ffe9
hf iclass dump - now uses cliparser 2020-11-25 14:02:52 -05:00
iceman1001 48b493a77a lf ti read -> converted to cliparser but hard to test/verify these commands. Most likely the continuous mode doesnt work because of impl of calling wo waiting 2020-11-25 19:48:10 +01:00
iceman1001 0d1760ad04 try to please coverity 2020-11-25 19:42:45 +01:00
iceman1001 2b34c64dde fix coverity 226302 2020-11-25 19:28:27 +01:00
iceman1001 3de8560456 lf pyramid - now uses cliparser, contiouos mode, and clone to EM (untested) 2020-11-25 16:27:54 +01:00
iceman1001 a12f32efa6 lf securakey clone - now supports EM4305/4469 (untested) 2020-11-25 16:20:44 +01:00
iceman1001 b7c0d6aa5e lf viking clone - now supports clone to EM4305/4469 (untested) 2020-11-25 15:13:32 +01:00
iceman1001 63e92c187c lf visa - now uses cliparser and reader continuous mode 2020-11-25 14:43:39 +01:00
iceman1001 0cb3704eee textual 2020-11-25 14:43:09 +01:00
iceman1001 2ad7a5b7f1 lf securakey read - renamed and now support contiuous mode 2020-11-25 13:39:32 +01:00
iceman1001 2ff7221874 lf viking read -> now renamed and supports contiuous mode 2020-11-25 13:34:52 +01:00
iceman1001 1e6fcd0291 added lf securakey sim - untested 2020-11-25 10:51:54 +01:00
tcprst c25ad02f88
add iclass keys found on pastebin to dic 2020-11-24 15:50:10 -05:00
iceman1001 04e0cdc9cf lf viking - now uses cliparse 2020-11-24 15:40:13 +01:00
iceman1001 3cb12356a2 textual 2020-11-24 12:53:29 +01:00
iceman1001 d24e0436dc hf 15 wrbl - missing some data output 2020-11-24 12:52:55 +01:00
iceman1001 f59d57aaab lf securakey - now uses cliparser 2020-11-24 12:52:09 +01:00
tcprst 0c0411c144
add short option and fix typo 2020-11-23 16:07:03 -05:00
tcprst 9ef0e07d49
hf iclass encrypt - now use cliparser 2020-11-23 15:42:32 -05:00
tcprst 4d616a1c09
hf iclass decrypt - now use cliparser 2020-11-23 14:46:07 -05:00
tcprst 1afb335478
make style 2020-11-22 19:39:54 -05:00
tcprst c80c7646da
iclass esave, eview - now use cliparser 2020-11-22 19:33:11 -05:00
iceman1001 a11e2ed4a6 hf mfdes info - cmk textual ( #1062 ) 2020-11-22 23:42:00 +01:00
tharexde 51d4c821b1 Merge branch 'master' into allin 
update 201120
 2020-11-20 22:19:37 +01:00
tharexde 86b9d2c620 cosmetics 2020-11-20 22:03:19 +01:00
iceman1001 1f8638c03b remove unused key 2020-11-20 19:15:50 +01:00
iceman1001 f75ba9bb33 comment out iclass autopwn 2020-11-20 19:07:51 +01:00
iceman1001 448394fa18 more clear message (thanks @amal!) 2020-11-20 15:45:14 +01:00
iceman1001 3113cfabcb lf t55xx wipe - helptext (thanks @amal!) 2020-11-19 23:33:55 +01:00
tharexde e642c05e5c Merge branch 'master' into allin 
update 201119
 2020-11-19 23:21:19 +01:00
tharexde 56efc8adec rearrangements 2020-11-19 23:18:04 +01:00
iceman1001 177fcbe4ca lf fdx clone - helptext 2020-11-19 22:01:47 +01:00
iceman1001 381a87c138 msleep, hints, auto, now uses cliparser 2020-11-19 20:44:44 +01:00
iceman1001 57eef7c5a9 hf mfdes.. a session flag to keep track of rf field up/down. Now selectaid/createaid/deleteaid works. However, hf mfdes auth is needed before. the rest of the commands needs to be adapted to this new style. The reason is that a "select application" command aborts a current authenticated session. So we need to authenticate and keep that on until we done. 2020-11-19 12:15:47 +01:00
iceman1001 4d28ffc014 hf mfdes deleteaid - shouldn't select before since it cancels the current session 2020-11-18 23:58:50 +01:00
iceman1001 4cafbcc259 hf mfdes - keeping track in the tag object of rf_field active status 2020-11-18 23:47:54 +01:00
tharexde 6e6f016460 deleted uneccessary function 2020-11-18 22:43:16 +01:00
iceman1001 f6aebe381b lf hid demod - add raw back 2020-11-16 20:06:33 +01:00
Philippe Teuwen 29b3477b00 lto: textual 2020-11-16 12:27:53 +01:00
tharexde 333fb5cbd4 clean up 2020-11-15 21:59:25 +01:00
iceman1001 bfc5cd061c remove dublicates 2020-11-15 21:42:17 +01:00
iceman1001 6341f751e5 maur defaults 2020-11-15 21:40:38 +01:00
tharexde f6e37d868e switched to PM3 status/error codes as return codes (if possible/sensible) 2020-11-15 19:54:51 +01:00
Ave 7c5e3a29de
Fix old UID display on hf mf csetuid 2020-11-15 20:14:08 +03:00
tharexde 2b301b140e - switched to PM3 error/status codes for reset function 
- wording
 2020-11-15 17:15:56 +01:00
tharexde d36645334a renaming 2020-11-15 01:56:00 +01:00
tharexde 79e1159eaf Merge branch 'master' into allin 
update 201114
 2020-11-14 19:56:02 +01:00
iceman1001 596a97a886 hf 14a raw - adapt return codes 2020-11-14 15:25:27 +01:00
iceman1001 8a11bfee10 hf 14a raw - fix cli parse args 2020-11-14 15:21:41 +01:00
iceman1001 1ae89950eb dbg printing 2020-11-14 12:40:59 +01:00
Philippe Teuwen 81e4286409 makefile: fix condition 2020-11-14 12:36:47 +01:00
Philippe Teuwen da6fe8fa97 cmake typo 2020-11-14 11:59:48 +01:00
Philippe Teuwen d33e870820 textual 2020-11-14 01:21:57 +01:00
Philippe Teuwen c9d60499e4 fix makefile 2020-11-14 01:05:53 +01:00
Philippe Teuwen 923d2942c2 py scripts 2020-11-14 00:44:18 +01:00
Philippe Teuwen 39a20b6226 scripts 2020-11-14 00:23:25 +01:00
Philippe Teuwen 71b0c3ce31 Makefile: fix dep 2020-11-14 00:19:16 +01:00
tharexde 7c0c4e2e7d deleted unnecessary memory checks (passwords are uploaded blockwise, the more passwords the more blocks) 2020-11-14 00:08:37 +01:00
Philippe Teuwen cc914ccac1 lib scripts 2020-11-13 22:40:08 +01:00
Philippe Teuwen c666269670 scripts 2020-11-13 22:40:08 +01:00
Philippe Teuwen f37088095b compile with swig files if available 2020-11-13 22:40:06 +01:00
Philippe Teuwen b4d8222c9a Waveshare: tested diy '2.13 inch e-paper B (with red)' 2020-11-13 22:32:46 +01:00
tharexde b91792f1d7 deleted uneccessary includes 2020-11-13 20:27:57 +01:00
iceman1001 3afbcaff2f fix coverity 305864, should be released when pointer is nulled 2020-11-13 16:27:29 +01:00
iceman1001 d9de790ea0 fix coverity 305865, add extra checks might quiet the coverity warning 2020-11-13 16:26:46 +01:00
iceman1001 1b697d2e42 less printf 2020-11-13 16:08:48 +01:00
iceman1001 f8c956e4ce less printf 2020-11-13 16:05:02 +01:00
iceman1001 63a26e6091 hf 14a raw - now uses cliparser 2020-11-13 12:20:01 +01:00
iceman1001 45f93acf3d remove fprintf, fwrite in emv 2020-11-13 12:19:24 +01:00
tharexde 9415363262 updated usage information 2020-11-13 00:50:49 +01:00
iceman1001 e09c7a9a3a remove fprintf, fwrite , in prep for libpm3 2020-11-12 22:37:47 +01:00
Iceman 0dd4786361
Merge pull request #1057 from nyanotech/waveshare-canvas-size 
waveshare: fix dimensions of 2.7" screen, test 1.54" screen
 2020-11-12 21:56:30 +01:00
iceman1001 0f4e31bfb0 adapt return codes 2020-11-12 21:51:05 +01:00
nyanotech a28d407e3d
waveshare: fix dimensions of 2.7" screen, test 1.54" screen 2020-11-12 20:45:59 +00:00
iceman1001 a28e5a88d1 fix #1056 - swapendianess for filenames based on uid 2020-11-12 21:13:52 +01:00
iceman1001 bd7f1c6bfb 7816_error - fix number to hex conversion (thanks @vortix) 2020-11-12 19:46:04 +01:00
iceman1001 2323ff7f57 fix bad formatt string (thanks @vortix) 2020-11-12 19:33:49 +01:00
iceman1001 9b94422966 remove dump.c step3 2020-11-12 18:45:41 +01:00
iceman1001 243d509203 remove dump.c step2 2020-11-12 18:43:03 +01:00
iceman1001 4e6ba6fcf5 removing dump_buffer step1 2020-11-12 18:25:56 +01:00
tharexde e444c2e942 Merge branch 'master' into allin 
update 201111
 2020-11-11 22:39:02 +01:00
tharexde f1b0b91585 - Relocated write requests of function „4x50_wipe" from device to client 
- used "INPLACE" attribute for messages in function 4x50_chk
 2020-11-11 22:37:17 +01:00
iceman1001 14ea72ca5d hf 14a apdu - textual 2020-11-11 18:29:27 +01:00
iceman1001 bf4cdf6eb7 remove dump_buffer_simple 2020-11-11 18:05:05 +01:00
iceman1001 8f67b511a6 textual, in prep for removing dump_buffer_simple 2020-11-11 18:01:04 +01:00
tharexde 3d14dbfbd0 pressing the pm3 button now stops 4x50_chk function 2020-11-11 01:37:54 +01:00
tharexde 99a21ae38c Merge branch 'master' into allin 
update 201111
 2020-11-11 01:14:45 +01:00
tharexde ae96cd869a relocated "pwd block management" from device to client 2020-11-11 01:11:09 +01:00
Philippe Teuwen eadacd82f5 SWIG experiments 
Squash of the following commits (a full rebase was too hard :( )
* ef309cfdf N - SWIG: create pm3.c (5 months ago)  <Philippe Teuwen>
* 05ba6a73f N - swig pm3_device -> pm3 (5 months ago)  <Philippe Teuwen>
* d59630183 N - swig: move pm3.i (5 months ago)  <Philippe Teuwen>
* 6adcfad75 N - Fix historic make & cmake (5 months ago)  <Philippe Teuwen>
* bcbef2edf N - Fix typo with script_embedded (5 months ago)  <slurdge>
* 538ee4dab N - Better SWIG integration: autogen func & attributes (5 months ago)  <slurdge>
* 756b62466 N - SWIG: few helper scripts (5 months ago)  <Philippe Teuwen>
* 47ba4acd0 N - SWIG %extend (5 months ago)  <Philippe Teuwen>
* 21841cb9d N - simplify scripts (5 months ago)  <Philippe Teuwen>
* 78c4f7929 N - Revert "SWIG experiments: introduce context" (5 months ago)  <Philippe Teuwen>
* 1562b75fc N - SWIG experiments: introduce context (5 months ago)  <Philippe Teuwen>
* a503dfcd9 N - SWIG experiments (5 months ago)  <Philippe Teuwen>
 2020-11-10 23:27:21 +01:00
tharexde 8a1558757c Merge branch 'master' into allin 
update 201110
 2020-11-10 00:47:13 +01:00
tharexde b791d392b6 switched from emulator memory to flash memory for various functions 2020-11-10 00:39:48 +01:00
tharexde ff0c4f924a updated short descriptions of em4x50 functions 2020-11-10 00:37:43 +01:00
iceman1001 089ae507be structs needs to be PACKED 2020-11-09 15:24:19 +01:00
iceman1001 3cd2c0b47b allow to write tags in unsecured pagemode 2020-11-09 09:58:30 +01:00
iceman1001 f894560325 hf mfdes fixes 2020-11-08 18:59:36 +01:00
Iceman 8ca004294f
Merge pull request #1051 from mwalker33/t55-detect-with-wake 
T55 detect with wake
 2020-11-08 11:28:04 +01:00
mwalker33 983c3a3a63 Detect with wakeup 
Detect with wake option to address init deley or AOR set.
 2020-11-08 21:03:33 +11:00
Philippe Teuwen 928d787970 print uid in 14a reader @ mode 2020-11-07 23:21:06 +01:00
Philippe Teuwen f63cf02178 make style 2020-11-07 01:32:43 +01:00
Philippe Teuwen 7a7d9c818b Merge branch 'sliceratwork/master' into master 
* sliceratwork/master:
  restore commands.md
  Delete commands.md
  Fix capitalization for command descriptions
 2020-11-07 01:31:42 +01:00
iceman1001 427e7c02e8 hf mfdes auth - textual 2020-11-06 23:52:11 +01:00
iceman1001 ac9d33c35f sAPDU printing.. these different apdu structs will need to be unified 2020-11-06 23:50:31 +01:00
Andrei 54527d03bf Fix capitalization for command descriptions 2020-11-07 00:34:30 +02:00
iceman1001 2cc5fb383c reorder command table 2020-11-05 12:50:51 +01:00
iceman1001 7f6e3a7cfc textual 2020-11-05 12:02:54 +01:00