RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-25 01:36:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
12148 commits 3 branches 14 tags 85 MiB
Commit graph

1748 commits

Author SHA1 Message Date
cyberpunk-re b52d50d30a Block0 source explicit in lf t55xx config and color coded 2020-12-08 22:54:29 +00:00
Christian Molson be3af8d32c Fix command help spacing/order for em4x70 2020-12-08 14:38:47 -05:00
Christian Molson 64dd8614d8 Remove unused cmflfem4x70 header from cmlfem410x.c 2020-12-08 14:36:23 -05:00
tharexde 1d083fdb67 Merge branch 'master' into update_4x50 
update 201208
 2020-12-08 20:23:59 +01:00
tharexde b83cbe8212 fixed Appveyor complaint 2020-12-08 20:20:49 +01:00
Nick Draffen 9646c34c94
Merge branch 'master' into topaz_cliparser 2020-12-08 14:05:30 -05:00
Iceman 77a041545c
Merge pull request #1089 from tcprst/thinfilm_cliparser 
hf thinfilm - now use cliparser
 2020-12-08 20:01:55 +01:00
tcprst 2c4f7cad70
fix missing newline in iclass restore helptext 2020-12-08 09:35:30 -05:00
cyberpunk-re 00cff49f9d fixed incorrect bitmask on modulation 2020-12-07 23:33:58 +00:00
cyberpunk-re 9ea6665a24 Fix issue #844 2020-12-07 12:55:11 +00:00
tharexde 12880aa419 help text adjustments regarding new command structure 2020-12-06 23:14:41 +01:00
tharexde 0ba4394532 cleanup 2020-12-06 23:08:43 +01:00
tharexde e4d0bfeced added missing commands for new "lf em" command structure 2020-12-06 23:00:26 +01:00
tharexde 894d973d69 Merge branch 'master' into update_4x50 
merged 201206
 2020-12-06 20:40:46 +01:00
tharexde 136339898a block number to be wiped first has to be dynamic 2020-12-06 19:26:20 +01:00
tharexde 314450b738 transferring data of dump file to device via 
- em4x50_eload or
	- file option "-f <filename>":
		- via spiffs if flash memory is available
		- via emulator memory if flash memory is not available
 2020-12-06 01:53:43 +01:00
tcprst 6427958e61
hf thinfilm - now use cliparser 2020-12-05 19:35:52 -05:00
tcprst 4ef311336c
hf topaz - now use cliparser 2020-12-05 19:17:57 -05:00
Christian Molson 4e592eba1c Merge branch 'master' into em4x70_support 2020-12-05 17:59:58 -05:00
iceman1001 54634b33b0 text 2020-12-05 23:51:00 +01:00
tharexde 0a21f7dd8f keys are copied blockwise via spiffs to device because of 
- flash memory limitation (big dictionaries)
	- user feedback (infos about progress)
 2020-12-05 23:47:53 +01:00
Christian Molson 614ab55809 Initial commit for em4x70 support. 
Initially I only have an em4x70 variant used for car transponders.
Also known as the ID48.
 2020-12-05 17:47:03 -05:00
iceman1001 ee3c0faee1 hf iclass -helptexts 2020-12-05 13:27:39 +01:00
iceman1001 697463fb69 text 2020-12-04 23:38:40 +01:00
iceman1001 4bde614006 text 2020-12-04 23:32:47 +01:00
iceman1001 c25eb722dc lf hid brute - set fmtlen.. 2020-12-04 23:16:15 +01:00
iceman1001 80fd00c104 text 2020-12-04 22:59:57 +01:00
tharexde 0e28c60fd0 additional message 2020-12-04 22:42:54 +01:00
iceman1001 2dc27cf2b7 fix double.. 2020-12-04 22:42:52 +01:00
iceman1001 4830bf7fec lf hid brute - fix param 2020-12-04 22:41:24 +01:00
tharexde 952845722c use piffs instead of direct writing to flash memory 2020-12-04 22:38:48 +01:00
iceman1001 7fc852be12 text 2020-12-04 22:30:15 +01:00
iceman1001 b115c82156 text 2020-12-04 22:25:04 +01:00
iceman1001 f22c0e87bc forgot a file 2020-12-04 00:14:18 +01:00
iceman1001 0f54421345 forgot a file 2020-12-04 00:13:37 +01:00
iceman1001 00f91b2a00 re-order the 'lf em' commands 2020-12-04 00:11:57 +01:00
tharexde 6876ff2f04 Relocated write requests in function 4x50_restore from device to client 2020-12-03 22:00:52 +01:00
tharexde d546936f5c Merge branch 'master' into update_4x50 
merge 20120merge 2012033
 2020-12-03 21:17:46 +01:00
tharexde 1de4991bd0 missing command options for restore function 2020-12-03 21:11:10 +01:00
tharexde 139d4fca9d changed in cli: 
<password> -> <hex>
<address> -> <dec>
<data> -> <hex>
<uid> -> <hex>
 2020-12-03 21:01:39 +01:00
tharexde 6448ade0f2 deleted client call of reset function 2020-12-03 20:47:01 +01:00
tharexde 414b892b65 - introduced macro for uint8_t p[4] -> uint32_t 
- returned to emulator memory for eload and esave
 2020-12-03 20:40:58 +01:00
Philippe Teuwen 81917aebdf tune hw tune warnings 2020-12-03 14:54:09 +01:00
iceman1001 a03240a0db text 2020-12-02 17:14:57 +01:00
iceman1001 1a2b89d92f lesser time 6 -> 3 sec wait 2020-12-02 17:14:27 +01:00
iceman1001 54e7f8d438 ... 2020-12-02 17:13:42 +01:00
iceman1001 effe02d1d3 hf iclass reader - unified to support -@ 2020-12-02 15:24:11 +01:00
iceman1001 512b8aa272 lf nedap - now uses cliparser, supports continuos mode, EM (untested) 2020-12-02 12:51:37 +01:00
iceman1001 23b0ad5183 textual 2020-12-01 22:09:07 +01:00
iceman1001 70af2bfbc0 hf iclass info - uses cliparser 2020-12-01 22:03:09 +01:00
iceman1001 84ebe37725 lf pcf7931 - now uses cliparser 2020-12-01 21:52:08 +01:00
iceman1001 2613284dfc fix lf search - cotag exiting on deviceside 2020-12-01 17:06:49 +01:00
iceman1001 2cabfd7e9d fix lf search - false positive cotag 2020-12-01 16:42:33 +01:00
iceman1001 480241645d fix lf search - false positive motorola 2020-12-01 16:41:48 +01:00
iceman1001 aa5d72a7a6 rem - now uses cliparser' 2020-12-01 15:16:23 +01:00
iceman1001 fccef24aea fix 'auto' - correct param when saving 2020-12-01 15:13:30 +01:00
iceman1001 e8fe88b50a lf jablotron sim, uses cliparser 2020-12-01 12:18:07 +01:00
iceman1001 584e1faba5 lf io - now uses cliparser, support continuous mode, EM (untested) 2020-12-01 11:47:03 +01:00
iceman1001 ae853ede79 reader - textual 2020-12-01 11:26:54 +01:00
iceman1001 51e27d1a48 adapt the brute 2020-12-01 10:42:55 +01:00
iceman1001 3764a4dd3b fix coverity 307527 2020-12-01 10:41:28 +01:00
Philippe Teuwen c8cb457fc6
Merge pull request #1082 from aveao/master 
gui: Show a warning if user does not have GUI support
 2020-12-01 01:47:36 +01:00
Ave 31e475764e
gui: Show a warning if user does not have gui support 
qt gui: Split no-DISPLAY warning into two lines

And add XQuartz link

qt gui: Account for proxspace on no-DISPLAY warning

gui: Move no-DISPLAY warning from Qt to generic code, fix bugs
 2020-12-01 03:10:20 +03:00
iceman1001 955b5365cf fix coverity 307536 2020-12-01 00:16:51 +01:00
tharexde b0b0d4b3f3 Merge branch 'master' into update_4x50 
fixed conflict
 2020-11-30 23:42:39 +01:00
tharexde a04d93e9ae replaced sprint by FillFileNameByUID 2020-11-30 23:38:27 +01:00
Iceman 1cfc69bd0d
Merge pull request #1079 from cyberpunk-re/MFU_SIM_maxReads 
MFU emulation now supports automatic exit after <num> blocks read.
 2020-11-30 23:14:00 +01:00
tharexde 9d52801259 Merge branch 'master' into update_4x50 
update 201130 2
 2020-11-30 21:18:03 +01:00
cyberpunk-re 5486bdd18c Added 'mf mfu sim t 7 n <numreads>' - MFU emulation now supports automatic exit after <num> blocks read. 2020-11-30 20:07:51 +00:00
iceman1001 1bccb77654 lf hid clone - prepped for EM. Disabled it for viking / hid clone until further testing 2020-11-30 21:06:37 +01:00
tharexde efd6c04b7e Merge branch 'master' into update_4x50 
update 201130
 2020-11-30 20:38:25 +01:00
tharexde 40d9880264 changed timeout behavior 2020-11-30 20:31:02 +01:00
iceman1001 6b93c84650 lf fdxb - now supports cliparser, continuous mode, EM (untested) 2020-11-30 16:40:00 +01:00
iceman1001 e3e4507d71 lf destron - now uses more cliparser, supports continuous mode, EM (untested) 2020-11-30 13:45:52 +01:00
Philippe Teuwen b9e86572da lf destron clone: fix parity, thanks @iceman for noticing it 2020-11-30 13:35:22 +01:00
iceman1001 94fa635fcd text 2020-11-30 12:08:35 +01:00
iceman1001 72a6537a3b lf cotag - now uses cliparser 2020-11-30 12:08:20 +01:00
iceman1001 681975d937 lf awid - now uses cliparser, continuous mode, EM (untested) 2020-11-30 04:06:48 +01:00
tharexde f03fac540a delated watch function (em4x50) 2020-11-30 00:03:22 +01:00
tharexde 8215955ba8 - changed CmdEM4x50StRread tp CmdEM4x50Reader 
- changed return value
 2020-11-29 23:59:36 +01:00
tharexde 96fc27a869 changed 4x50_stdread to 4x50_reader 2020-11-29 23:57:43 +01:00
tharexde a319b07690 changed 4x50_stdread to 4x50_reader 2020-11-29 23:57:33 +01:00
iceman1001 2fcd46f278 lf ti write - now uses NG, cliparser (untested) 2020-11-29 14:00:51 +01:00
iceman1001 26f7aa4cee text 2020-11-29 12:53:39 +01:00
iceman1001 c05f75c551 lf gallagher - now uses cliparser, supports continuous mode, EM (untested) 2020-11-29 12:49:09 +01:00
iceman1001 3546f2c071 lf gprox - now uses cliparser, continuous mode, EM (untested) 2020-11-29 12:33:09 +01:00
iceman1001 1e3ffe2624 lf hid, idteck, keri - demod , continuous mode 2020-11-29 12:13:54 +01:00
iceman1001 487524436c lf cliparser stuff 2020-11-29 12:06:45 +01:00
iceman1001 3bdbeb2b44 lf io demod, reader, - use cliparser, continuous mode 2020-11-29 11:40:31 +01:00
iceman1001 2a4fbe6ddc lf indala reader - support continuous mode 2020-11-29 11:39:36 +01:00
Iceman 681f13e04f
Merge pull request #1078 from tcprst/mfp_cliparser 
hf mfp info - now use cliparser
 2020-11-29 02:03:45 +01:00
tcprst ae93b28d7e
hf mfp info - now use cliparser 2020-11-28 19:59:30 -05:00
iceman1001 878170f2bd some lF commands demod got cliparser 2020-11-29 01:45:26 +01:00
tharexde 9ff29b8d4e fixed status (BUTTON_SINGLE_CLICK not available in client) 2020-11-29 01:44:37 +01:00
tharexde b3f1438c6b fixed missing adaption due to changes in 4x50_write 2020-11-29 01:10:45 +01:00
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 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
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
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
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 90509c6a82 lf pac - now uses cliparser, support continuous mode, and EM (untested) 2020-11-26 23:43:43 +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
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
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 0fc6f4d502 iceman egg 2020-11-14 01:13:07 +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 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 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 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
Philippe Teuwen d500d1d6e9 flasher: textual 2020-11-05 01:09:29 +01:00
iceman1001 e149dc4ad2 lf hid demod - print hex values of demod if unpacking of wiegand failed 2020-11-04 19:21:44 +01:00
iceman1001 0a0155fea7 refactore printDemodbuff fct. 2020-11-04 19:19:38 +01:00
iceman1001 d8b2f962e5 text 2020-11-04 08:24:44 +01:00
iceman1001 5f9abb0263 fix #1048 - add LTO dump type 0002 2020-11-04 08:24:17 +01:00
iceman1001 59a68dc4ec added 32bit, 37bit formats from cardinfo 2020-11-03 20:47:47 +01:00
iceman1001 877d9bd455 hf 14a info - ATS part got some love 2020-11-03 17:29:29 +01:00
Philippe Teuwen c03daf233c Add support for 10b UID in hf 14a sim 2020-11-03 02:32:41 +01:00
iceman1001 0e5640a631 fix coverity 303814 2020-11-02 18:28:15 +01:00
iceman1001 786accc487 fix coverity 286660 2020-11-02 17:59:30 +01:00
iceman1001 feddfe7f43 fix coverity 303441, 303442, 303486, 286660 2020-11-02 17:55:48 +01:00
iceman1001 e91c46616a fix, coverity 303794 2020-11-02 17:27:39 +01:00
iceman1001 89e7317489 fix, part coverity, part bad user input combo 2020-11-02 17:25:09 +01:00
Iceman 03bd9e00b2
Merge pull request #1046 from tcprst/iclass_cliparser2 
hf iclass eload, loclass - now use cliparser
 2020-11-02 08:03:58 +01:00
tcprst 4c333ff02f
Update references to hf iclass loclass 2020-11-01 21:02:51 -05:00
tcprst 9ec126a80b
hf iclass loclass - now uses cliparser 2020-11-01 20:58:14 -05:00
tcprst 2648ed0354
update eload argument text 2020-11-01 20:15:32 -05:00
tcprst 71cf7da4c2
hf iclass eload - now uses cliparser 2020-11-01 20:10:13 -05:00
tcprst 2eac5d8dd4 Fix missing hyphens on command examples 2020-11-02 01:53:30 +01:00
Philippe Teuwen 777cb5a8ce make style 2020-11-02 01:46:47 +01:00
Philippe Teuwen 7278310e27 clean 2020-11-02 01:46:05 +01:00
Philippe Teuwen a359e4fac4 Make use of aid_desfire info 2020-11-02 01:38:07 +01:00
tharexde 836ca5da40 Merge branch 'master' into allin 
update 201101
 2020-11-01 22:57:07 +01:00
tharexde 6af4bc1f1b - added first version of 4x50_chk 
- renamed 4x50_write_password to 4x50_writepwd
- added check regarding valid data in emulation memory for 4x50_esave
- minor changes
- introduced new cliparser
 2020-11-01 22:53:10 +01:00
tharexde 3ddd9f8a91 - added first version of 4x50_chk 
- renamed 4x50_write_password to 4x50_writepwd
 2020-11-01 22:44:16 +01:00
NZSmartie c9a10631de
Gallagher key checking is now supported on MIFARE Desfire 
Both `hf mfdes auth` and `hf mfdes chk` now support Key Diversification for
AN10922 and as special treat, Gallagher issued cards.

For `hf mfdes auth`:
```
    -d, --kdf <kdf>                Key Derivation Function (KDF) (0=None, 1=AN10922, 2=Gallagher)
    -i, --kdfi <kdfi>              KDF input (HEX 1-31 bytes)
```

And for `hf mfdes chk`:
```
    -f, --kdf <kdf>                Key Derivation Function (KDF) (0=None, 1=AN10922, Gallagher)
    -i, --kdfi <kdfi>              KDF input (HEX 1-31 bytes)
```

Examples:
- `hf mfdes auth -a 2081f4 -m 3 -t 4 -d 2 -n 2 -k 00112233445566778899aabbccddeeff`
  Will diversify the key for key `2` on AID `2081F4` for Gallagher issued cards

- `hf mfdes chk -f 1 -i 00112233 -d mfdes_default_keys`
  Will read in all the default keys from the dictionary, and diversify them
  using AN10922 with the input data `00112233`

- `hf mfdes chk -f 2 -d mfdes_default_keys`
  Will read in all the default keys from the dictionary, and diversify them
  using AN10922 but with input data generated from the card's UID, AID and
  key number.
 2020-11-02 01:41:48 +13:00
NZSmartie 634c69398d
Split out mfdes_get_info from CmdHF14ADesInfo 
Change needed so that UID can be read for later
 2020-11-02 01:09:48 +13:00
NZSmartie 5a3502920c
Improve hf mfdes chk key checking and fix specifying single AID 2020-11-01 13:40:46 +13:00
iceman1001 4b33a21d09 exclude 0x6d 00 2020-11-01 00:14:47 +01:00
tharexde d977902fd8 Merge branch 'master' into allin 
update 201031
 2020-10-31 14:56:23 +01:00
tharexde 098ca87c81 renamed std_read -> stdread 2020-10-31 14:53:52 +01:00
NZSmartie b788054aca
Add initial suport for MIFARE Key Diversification 
This adds two new options to `hf mfdes auth`

```
    -d, --kdf <kdf>                Key Derivation Function (KDF) (0=None, 1=AN10922)
    -i, --kdfi <kdfi>              KDF input (HEX 1-31 bytes)
```

By specifying `-d 1` and some kdf data `-i 00112233`, the key will be
diversified using AN10922.
 2020-10-31 21:17:35 +13:00
tharexde 35a671d592 sing emulator memory for sim and restore 2020-10-31 01:51:40 +01:00
iceman1001 9c5b3b7a72 text, and no parity check for ADT 31 2020-10-30 21:28:56 +01:00
iceman1001 cc1ff2e3eb added Smartpass, bqt, and fixed non-parity for N10002 2020-10-30 21:20:26 +01:00
iceman1001 585d2e6e3e Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-30 21:19:52 +01:00
Philippe Teuwen c8d223b9c9 reminder... (thanks amal!) 2020-10-30 21:01:59 +01:00
iceman1001 6a6e3053d8 add casi-rusco 40bit format 2020-10-30 20:46:09 +01:00
iceman1001 e5e2852eb1 lf t55xx chk - now uses default dictionary if none is specified 2020-10-30 17:34:19 +01:00
iceman1001 60b12ca905 more details of recovery 2020-10-30 02:32:13 +01:00
iceman1001 d42350baff allow for different sectors 2020-10-30 02:25:54 +01:00
iceman1001 6534034e54 adapted reset 2020-10-30 02:19:15 +01:00
iceman1001 c1ed65bc4c added reset state 2020-10-30 02:12:36 +01:00
iceman1001 3b7200d1b1 hide debug 2020-10-30 02:06:14 +01:00
iceman1001 257358ac12 added "hf mf supercard" , to extract key from card 2020-10-30 02:04:44 +01:00
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 6391a9ab00 fix: run gen3 on non MFC 2020-10-29 10:54:22 +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
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
iceman1001 d7d809a8e3 remove extra parenthesis 2020-10-26 10:00:44 +01: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 ce50c50fcd lf keri demod - when doing invert of bits, do before decoding 2020-10-21 08:49:40 +02:00
iceman1001 be8d2fbd25 add u64_from_hex, no need to use 0x, thanks @mwalker33!\n reverse blocks when cloning for em4305/4469 2020-10-21 08:42:33 +02:00
iceman1001 0ccbd6e0fb just for testing, lf keri clone , now has experimental support for EM4305 2020-10-21 00:37:36 +02:00
iceman1001 527d1c9442 all prepped for EM4x05 to be used with clone commands 2020-10-20 23:10:34 +02:00
iceman1001 2479b54eb9 forgot 2020-10-20 22:22:21 +02:00
iceman1001 fa96a6ef80 prepping for adding support of EM4305 to clone commands 2020-10-20 21:59:33 +02:00
Philippe Teuwen 47cfc778e3 typos 2020-10-20 20:22:54 +02:00
Philippe Teuwen e7a76cee5a ugly fix for gcc10 stringop-overflow warning 2020-10-20 19:28:57 +02:00
iceman1001 d8294a958b hf 14a antifuzz - now uses NG 2020-10-20 17:36:01 +02:00
iceman1001 2e27a493e8 revert to precision clock 2020-10-20 17:34:42 +02:00
Philippe Teuwen 3959b77feb 4x05 sniff: available offline 2020-10-20 16:12:34 +02:00
mwalker33 96a6b99a80 Update cmdlfem4x05.c 
Early bug fixs and extend to all commands.
 2020-10-20 16:06:13 +02:00
Philippe Teuwen a6beff18a5 fix em 4x05 bf 2020-10-20 15:46:44 +02:00
Philippe Teuwen ecf50070dd typo, thanks iceman 2020-10-20 14:16:15 +02:00
Philippe Teuwen 3b83e8e703 EM 4x05 login bf 2020-10-20 13:21:40 +02:00
Philippe Teuwen 9003b96312 EM: typos 2020-10-20 13:18:48 +02:00
Iceman 398da9eb0b
Merge pull request #1022 from mwalker33/em4x05-sniff 
Em4x05 sniff
 2020-10-20 11:16:15 +02:00
mwalker33 3979363b69 em4x05 sniff 
V1 for testing
 2020-10-20 17:52:32 +11:00