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

6904 commits

Author SHA1 Message Date
iceman1001 114cc98600 less output 2020-10-12 19:32:36 +02:00
iceman1001 7cfbdcbae9 WIP - hf mfu countertear ... 2020-10-12 19:08:29 +02:00
iceman1001 acada02e37 hf 14a raw - no crc check on the iso14 select card response 2020-10-12 18:35:47 +02:00
Philippe Teuwen 25195b3197 fix destron clone command 2020-10-12 13:57:50 +02:00
Philippe Teuwen 2ee9ea0ef3 Add Destron 2020-10-12 13:42:33 +02:00
Philippe Teuwen cb0ad464c1 Fix T55xx modulation parser 2020-10-12 13:42:33 +02:00
iceman1001 a9400bed51 Q5 - wrong setting 2020-10-12 13:08:34 +02:00
Uli Heilmeier e9087175a2 cmdhflegic: Make sure to show help text 
Show usage when parameter h is used or none parameter
 2020-10-12 11:25:32 +02:00
mwalker33 43907dc4ed Update cmddata.c 
Fix issues when char cast to int8_t
 2020-10-12 15:33:14 +11:00
iceman1001 dcc33d5904 text 2020-10-12 02:01:34 +02:00
iceman1001 36f1c33321 hf mfu otptear -m fix 2020-10-12 01:57:22 +02:00
iceman1001 b64742baf9 hf mfu otptear -m fix 2020-10-12 01:55:39 +02:00
iceman1001 00f36f0335 hf mfu otptear -m fix 2020-10-12 01:51:35 +02:00
iceman1001 14bc37bbcb stop. 2020-10-12 01:44:16 +02:00
Philippe Teuwen fa332b1ba4 fdxb: add manufacturers & countries 2020-10-12 01:35:10 +02:00
iceman1001 cb18c4cbd9 text 2020-10-12 01:09:16 +02:00
Philippe Teuwen 539c376dd3 typedef name 2020-10-12 01:01:07 +02:00
iceman1001 79f57b2019 textual 2020-10-12 00:36:08 +02:00
Philippe Teuwen fb46e326c4 fdxb: shows new ISO amendment fields 2020-10-12 00:20:51 +02:00
iceman1001 91c979d56a lf em4x05_chk - textual and now always do the default keys.. 2020-10-11 23:43:42 +02:00
Philippe Teuwen 092927f38e tearoff tips 2020-10-11 23:19:10 +02:00
iceman1001 90a4f4d44c add: lf em 4x05_chk - a check password command 2020-10-11 22:44:05 +02:00
Philippe Teuwen 55fa5e7c35 make style 2020-10-11 22:40:05 +02:00
Philippe Teuwen 76701af8a7 Make clear current FDX in Pm3 is FDX-B only 2020-10-11 22:38:52 +02:00
tharexde b4a8409349 clean up 2020-10-11 20:06:03 +02:00
Philippe Teuwen 8693083747 fix em 4x05 dump indexes 2020-10-11 19:43:56 +02:00
iceman1001 bc9545d493 hf mfu otptear - textual, changing order on initial write device 2020-10-11 18:03:29 +02:00
Philippe Teuwen 91f9ea4b40 em tearoff full auto mode 2020-10-11 16:01:34 +02:00
Philippe Teuwen a268023707 em tearoff: check commit 2020-10-11 14:00:38 +02:00
Philippe Teuwen cd892035dd em tearoff check 2020-10-11 13:16:23 +02:00
Philippe Teuwen e636934dac em tearoff: rewrote the logic a bit 2020-10-11 13:04:20 +02:00
Philippe Teuwen 755a6cab49 em tearoff: fix initial read val 2020-10-11 11:45:59 +02:00
iceman1001 1f03d93600 adaptations 2020-10-11 11:09:58 +02:00
iceman1001 43f4bba432 hf mfu otptear - use high precision clock instead 2020-10-11 10:59:57 +02:00
iceman1001 8f536d6655 hf mfu otptear - interruptable with keyboard 2020-10-11 10:19:20 +02:00
iceman1001 ec679385b9 hf mfu otptear - textual 2020-10-11 09:51:56 +02:00
iceman1001 9aaae19b54 fix print w vars in lua 2020-10-11 01:35:56 +02:00
iceman1001 e003618b3e hw tearoff - silent option 2020-10-11 01:09:31 +02:00
iceman1001 451d82c714 text 2020-10-10 22:52:15 +02:00
iceman1001 cf32ece9ff text 2020-10-10 22:51:51 +02:00
iceman1001 f3b2d05c51 less messages 2020-10-10 22:50:54 +02:00
Marcos Del Sol Vives ad2d993ae0 Fix last block for UL-C 2020-10-10 21:02:23 +02:00
Marcos Del Sol Vives ae5cace86d Added customizable 3DES key to hf mfu cauth 2020-10-10 20:38:58 +02:00
Philippe Teuwen 18d89f8896 script tearoff: increase timing only if static 2020-10-10 20:05:19 +02:00
Philippe Teuwen d3908f802e lf_em_tearoff_protect script 2020-10-10 19:50:13 +02:00
iceman1001 743ac26708 make debug.. 2020-10-10 18:14:04 +02:00
Philippe Teuwen 235d920b52 em 4x05_dump: indication of active PW closer to reality 2020-10-10 17:20:43 +02:00
Philippe Teuwen 7562bc851a em tearoff: remove early quit for detecting write phase 2020-10-10 10:53:46 +02:00
iceman1001 0d0c42a56e hw tearoff - colors 2020-10-10 10:45:15 +02:00
iceman1001 fa2bde2876 textual 2020-10-10 10:35:50 +02:00
iceman1001 49fb14b7f3 script can lock on to one value in loop 2020-10-10 10:03:15 +02:00
Philippe Teuwen 664ae6fa1d typos 2020-10-10 10:00:38 +02:00
iceman1001 e14c1aaf21 more options 2020-10-10 09:24:47 +02:00
iceman1001 ba8a4fdf5f experimenting with em4x05 tearoff 2020-10-10 07:59:17 +02:00
Philippe Teuwen 627b7a242c hw tune warns about possible mismatch between fw & actual hw, based on Q factor measurements :) 2020-10-10 01:43:39 +02:00
Philippe Teuwen 104377362a hw tune: compute Q 2020-10-10 00:55:55 +02:00
iceman1001 2098a6113b enable 4x05_read via lua 2020-10-10 00:51:02 +02:00
iceman1001 6454e168fb adapt for data load changes 2020-10-09 22:25:33 +02:00
iceman1001 4d5d45659d helptext rearrange 2020-10-09 22:20:19 +02:00
Philippe Teuwen b1b40c0985 set cursors on hw tune plot 2020-10-09 21:51:52 +02:00
Philippe Teuwen 9be8b341ff lighter blue for cursorD, more visible 2020-10-09 21:51:52 +02:00
Philippe Teuwen 9020b1292c fix GridOffset type 2020-10-09 21:51:52 +02:00
iceman1001 470a0a5978 actually fix the list options 2020-10-09 20:46:48 +02:00
iceman1001 cd2c95251f text 2020-10-09 20:20:12 +02:00
iceman1001 64a44d1e85 adapt list command to allow for options 2020-10-09 20:19:36 +02:00
iceman1001 627a361666 trace list, load, save - now uses cliparser 2020-10-09 19:45:29 +02:00
iceman1001 8990caca2a text 2020-10-09 18:11:27 +02:00
iceman1001 5060c9cf0d data decimate / undecimate - now uses cliparser 2020-10-09 18:08:46 +02:00
Philippe Teuwen 1acd0a516a data undec: interpolate 2020-10-09 17:21:13 +02:00
iceman1001 1e0fd49bdd .... 2020-10-09 17:02:48 +02:00
iceman1001 2065d7a2c6 sub carrier and fsk clock 2020-10-09 17:02:28 +02:00
Philippe Teuwen 1e37d548c2 plot: allow float values for grid 2020-10-09 16:49:50 +02:00
Philippe Teuwen 984b0d4803 fix plot grid for non-integer zoom factors 2020-10-09 16:22:54 +02:00
iceman1001 4c85ce5f2f Add - analyse lf signal in graphbuffer and detects clock and matching modulations 2020-10-09 16:21:44 +02:00
Philippe Teuwen ee3f5a9c2b rename t55xx trydetectmod 2020-10-09 15:31:27 +02:00
Philippe Teuwen 07023657f2 generic tearoff: make use of new @iceman SpinDelayUsPrecision :) 2020-10-09 14:55:17 +02:00
Philippe Teuwen 7f8a4b4182 Add generic tear-off hook 2020-10-09 01:52:56 +02:00
iceman1001 adb5ec1676 adapt lua for hid sim 2020-10-08 21:49:18 +02:00
iceman1001 4a8edc4e54 adapt lua for hid clone 2020-10-08 21:47:54 +02:00
iceman1001 c5b3443fe6 lf hid sim - now uses cliparser and --fc, --cn options 2020-10-08 21:46:53 +02:00
iceman1001 3f977043bd lf hid clone - textual 2020-10-08 20:32:45 +02:00
iceman1001 a547690af5 fix mem leak 2020-10-08 20:27:15 +02:00
iceman1001 9162a9d5f0 lf hic clone - now use cliparse and support FC,CN and RAW 2020-10-08 20:26:46 +02:00
Philippe Teuwen 8fbe3b4463 incognito: make sure prefs file is not loaded/saved in any circumstances 2020-10-08 10:06:05 +02:00
Philippe Teuwen 12fd83b5a1 incognito: text 2020-10-08 09:52:33 +02:00
Philippe Teuwen bd6effd980 Don't save prefs in incognito mode 2020-10-08 09:50:17 +02:00
Philippe Teuwen 543393f7f8 fix EM4205 detection 2020-10-08 09:49:39 +02:00
Philippe Teuwen a0a7a3960e EN4x05 dump: show reason of read fails 2020-10-07 23:48:49 +02:00
Philippe Teuwen 229da561d6 EM4x05: avoid false positives in preamble detection 2020-10-07 23:48:14 +02:00
Philippe Teuwen 1d8c268b8b EM4x05: don't mark first pages as RO, textual 2020-10-07 23:16:54 +02:00
Philippe Teuwen f4feaa6a03 EM4x05: capture tag 'error preamble' answer as well 2020-10-07 22:55:43 +02:00
Philippe Teuwen 9962b8769a EM4x05: add support for Protect command 2020-10-07 18:38:47 +02:00
Philippe Teuwen ad6632beee EM4x05 dump: show when lock bits are unknown and show active PR word 2020-10-07 16:06:05 +02:00
Philippe Teuwen 9395b9581f EM4x05 dump: improve few things, see details: 
- textual
- don't write command passwd in dump it tag is not pwd protected
- don't dump wrong Word14/15 if we couldn't read them
 2020-10-07 15:45:47 +02:00
Philippe Teuwen 70f11c4097 em4x05 dump text 2020-10-07 13:01:24 +02:00
Philippe Teuwen c24383c189 typo 2020-10-07 12:09:56 +02:00
iceman1001 eb05cadb1c hid 2020-10-07 01:29:00 +02:00
Philippe Teuwen 3872b5bd66 Move back jansson_path as it's not part of upstream and breaks usage of system jansson lib 2020-10-07 01:11:40 +02:00
iceman1001 7ea0324a62 lf hid read - increase amount of samples to reaed in order to fit long formats 2020-10-07 00:47:34 +02:00
iceman1001 0439e3ed60 style 2020-10-07 00:05:12 +02:00
iceman1001 8c726c157b fix savejson mem leaks 2020-10-07 00:04:20 +02:00
iceman1001 6338a9edbb fix json memory leaks 2020-10-07 00:03:08 +02:00
iceman1001 634270f172 remove debug symbols 2020-10-06 23:46:56 +02:00
iceman1001 02df6ebbf7 bad memcpy based on size 2020-10-06 23:45:04 +02:00
iceman1001 83baa88340 filename pointer mem leak 2020-10-06 23:26:56 +02:00
iceman1001 a659e24064 text 2020-10-06 23:20:50 +02:00
iceman1001 f856087aa9 move jansson files from client 2020-10-06 21:45:32 +02:00
iceman1001 26f7f07120 mem leak out of bounds 2020-10-06 21:35:40 +02:00
Philippe Teuwen 491adacb94 get rid of tabs 2020-10-06 20:45:13 +02:00
iceman1001 073c630458 data raw am - fix length checks 2020-10-06 20:31:21 +02:00
Philippe Teuwen 3f9ddf9b29 make style 2020-10-06 18:41:15 +02:00
Philippe Teuwen 008c920db0 Add incognito option to avoid manglign history & logs during tests 2020-10-06 18:11:45 +02:00
iceman1001 64f9bb5e01 style 2020-10-06 18:00:00 +02:00
iceman1001 c55b4d5aac style 2020-10-06 17:50:20 +02:00
Iceman ddd92fcf69
Merge pull request #1000 from tcprst/iclass_cliparser 
hf iclass view, permute - now use cliparser
 2020-10-06 17:16:11 +02:00
iceman1001 4eb11f470d reveng mem leaks 2020-10-06 17:14:10 +02:00
iceman1001 01c35a9bfb style 2020-10-06 16:17:57 +02:00
iceman1001 feae472a41 mem leaks 2020-10-06 15:59:12 +02:00
iceman1001 154d3ff222 bad copies 2020-10-06 15:54:56 +02:00
iceman1001 fa2d9a77b9 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-06 15:42:23 +02:00
iceman1001 8ad8e2322e fix heap - unpack return ref to int* 2020-10-06 15:42:17 +02:00
Philippe Teuwen a647ceda23 fix buffer underflow read 2020-10-06 15:41:57 +02:00
tcprst fbc7f05ad1
rebase on master, fix merge conflict 2020-10-06 09:33:02 -04:00
tcprst c85d919e20
hf iclass view - now use cliparser 2020-10-06 09:30:35 -04:00
tcprst adacace012
hf iclass permute - now use cliparser 2020-10-06 09:30:35 -04:00
Philippe Teuwen 25180af135 DEFLDFLAGS 2020-10-06 14:56:26 +02:00
Philippe Teuwen 91d9463c2a cmdtrace: avoid 'strncat output may be truncated' warning 2020-10-06 14:39:36 +02:00
Philippe Teuwen a5c6130c7a waveshare: fix 'may be used uninitialized' warning 2020-10-06 14:32:14 +02:00
Philippe Teuwen 5b4e4dc4a4 plot: add </> to realign demod plot on samples 2020-10-06 14:23:24 +02:00
Philippe Teuwen fd3b440eea plot trim: adjust demod graph and cursors when possible 2020-10-06 14:23:24 +02:00
iceman1001 30cc0b4b48 fix lf wiegand - only take one format 2020-10-06 12:22:23 +02:00
Philippe Teuwen 64e1498cc7 data scale -> timescale 2020-10-06 12:13:39 +02:00
Philippe Teuwen 31909ff140 text 2020-10-06 12:01:11 +02:00
iceman1001 5304eca07d hf waveshare loadbmp -f only one 2020-10-06 11:58:32 +02:00
iceman1001 afa8393aa8 hf waveshare loadbmp -f is mandatory 2020-10-06 11:53:48 +02:00
iceman1001 701b924f03 hf waveshare loadbmp - now uses cliparser 2020-10-06 11:44:55 +02:00
Philippe Teuwen 72a0ee0994 waveshare: extra checks and info 2020-10-06 11:33:36 +02:00
iceman1001 957a1a8bf3 lf fdx demod - less strick len check 2020-10-06 10:21:46 +02:00
iceman1001 d316d96e04 lf hid demod - now uses wiegandtools instead 2020-10-06 10:21:07 +02:00
tharexde 68db54028c added function 4x50_watch 2020-10-05 22:59:08 +02:00
Philippe Teuwen 8691d3b77f hf 14a info: tells when no ATS but SAK pretends 14a-4 2020-10-05 22:33:33 +02:00
Philippe Teuwen 9c856fd9f4 Gen3 detection: be prudent, false positives are possible 2020-10-05 22:33:33 +02:00
iceman1001 7cebb832b6 14a,b raw - textual 2020-10-05 21:39:47 +02:00
iceman1001 08a875c259 coverity 301403 2020-10-05 13:56:12 +02:00
iceman1001 904bc51fb6 coverity 303200 2020-10-05 13:40:01 +02:00
iceman1001 537a21b2fa coverity 303199 2020-10-05 13:39:10 +02:00
iceman1001 d2e75de06e coverity 303195 2020-10-05 13:38:04 +02:00
iceman1001 a5bd3d7c32 coverity 303191 2020-10-05 13:36:17 +02:00
iceman1001 d5cc802e57 coverity 294394 2020-10-05 13:33:24 +02:00
iceman1001 fbec6b0c35 puts -> printandlog 2020-10-05 12:58:33 +02:00
mwalker33 702e9b774e Update proxguiqt.cpp 
Removed comment test sprintf
 2020-10-05 12:38:42 +02:00
mwalker33 3286bdaad2 Update Makefile 
Restore the original client makefile
 2020-10-05 12:38:42 +02:00
mwalker33 f157fac2fb Add option to hide/show plot sliders 2020-10-05 12:38:42 +02:00
Philippe Teuwen 7051941525 colored plot help 2020-10-05 12:28:02 +02:00
Philippe Teuwen 1f2133fa17 zoom: add ctrl for small increments with key, to get same as with wheel 2020-10-05 12:28:02 +02:00
Philippe Teuwen 128fdd82e2 text 2020-10-05 12:28:02 +02:00
iceman1001 7dcc4a2a76 renamed a fault param, starting to adapt 14b raw to deal with different selects and not clearing trace. 2020-10-05 10:33:34 +02:00
iceman1001 f6640966ed coverity 303194 2020-10-05 10:31:53 +02:00
Philippe Teuwen 4eef1f1bff Trim: GraphPixelsPerPoint mush remain a power of zoom_offset 2020-10-05 10:07:24 +02:00
iceman1001 1c5a6d6c04 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-05 09:45:37 +02:00
Philippe Teuwen 13badb6088 scroll zoom: use fractions of power of 2 to avoid desync between key and mouse zoom 2020-10-05 09:34:38 +02:00
iceman1001 73af6527b9 hf 14b raw, apdu - adapt options 2020-10-04 22:48:33 +02:00
Philippe Teuwen b95d834e96 attempt to fix 996 2020-10-04 21:07:46 +02:00
Iceman e7e3f42634
Merge pull request #995 from tcprst/lfkeri_cliparser 
lf keri clone, sim - now use cliparser
 2020-10-04 21:06:30 +02:00
Philippe Teuwen 0339667e9e cliparser: ignore extra spaces between options 2020-10-04 20:33:56 +02:00
tcprst bc34aba175
update scripts with new keri syntax 2020-10-04 14:08:07 -04:00
Philippe Teuwen 1b0875dd78 remove comment 2020-10-04 20:06:18 +02:00
Philippe Teuwen 2422622da1 plot: add Trim (T) 2020-10-04 20:01:38 +02:00
Philippe Teuwen e179fdb3b0 plot: fix mean, rework annotations 2020-10-04 20:01:38 +02:00
tcprst 67da4e6b36
lf keri clone, sim - now use cliparser 2020-10-04 13:59:02 -04:00
iceman1001 4f4593d9fa remove debugstatement 2020-10-04 18:54:43 +02:00
iceman1001 c528eacf24 wiegand cmds now use cliparse 2020-10-04 17:41:27 +02:00
iceman1001 166e626c98 add u64_y support in argtable-cliparser. 2020-10-04 17:41:04 +02:00
iceman1001 ad494a152c cliparser returns signed ints, to get unsigned 32 we need to use the double. 2020-10-04 16:13:17 +02:00
Philippe Teuwen e41efe192b data scale: check param 2020-10-04 15:20:28 +02:00
Philippe Teuwen 2d15fde0a8 data scale: use cliparser and add unit string 2020-10-04 15:14:56 +02:00
Philippe Teuwen aa3d29e6ac CLIParamStrToBuf: add string null terminator 2020-10-04 15:11:36 +02:00
Philippe Teuwen 6a87677273 fix inverse zoom factors 2020-10-04 13:46:33 +02:00
iceman1001 55bbbaf049 text 2020-10-04 11:09:54 +02:00
iceman1001 1267584e3f wiegand - now uses cli parse 2020-10-04 11:07:26 +02:00
iceman1001 dc9e16a4e1 add some defines to get double 2020-10-04 10:57:21 +02:00
iceman1001 12b3a7c236 fix: data mtrim - no crashing 2020-10-04 02:24:10 +02:00
iceman1001 3771f14c2b 14b mobib script 2020-10-04 02:09:16 +02:00
iceman1001 c0635b9045 convert to 14b apdu 2020-10-04 00:05:37 +02:00
tharexde b0cfb28d40 Merge branch 'master' into allin 
update
 2020-10-03 23:34:23 +02:00
tcprst 51c0d07eb9
lf hid clone, sim, brute, watch - now use cliparser 2020-10-03 15:40:03 -04:00
iceman1001 8e1546b012 textual 2020-10-03 17:14:57 +02:00
iceman1001 cc245016ea mem * - now uses cliparser 2020-10-03 17:12:58 +02:00
iceman1001 357921f561 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-10-03 14:12:48 +02:00
iceman1001 2f0fec449b fix wrong param 2020-10-03 14:09:24 +02:00
mwalker33 68f0945d48 Update argtable3.c 
Remove = when only long option
 2020-10-03 20:21:16 +10:00
iceman1001 670e2fb6b0 standard form output (concatenated) 2020-10-03 11:48:52 +02:00
Iceman 8cea993287
Merge pull request #990 from mwalker33/cliparser 
Cliparser
 2020-10-03 11:13:13 +02:00
mwalker33 e6398674b0 Cliparser cleanup 
Update to remove "=" from help text
update md file, fix typos and better notses for the options.
 2020-10-03 19:06:01 +10:00
Iceman 9fc3743e72
Merge pull request #988 from tcprst/st25_cliparser 
hf st commands - now use cliparser
 2020-10-03 11:03:46 +02:00
tcprst 3da2130153
fix cliparser for hf st sim UID 2020-10-02 21:35:09 -04:00
tcprst 3787c6e991
hf st commands - now use cliparser 2020-10-02 21:23:03 -04:00
iceman1001 d612f17b13 hf 14b sriread - uses cliparser 2020-10-03 00:03:44 +02:00
iceman1001 40413c9b0c zero padding 2020-10-02 20:19:58 +02:00
iceman1001 2b4124d665 hf 14b dump - now uses cliparser, and only work on ST SRx tags 2020-10-02 19:40:01 +02:00