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

1748 commits

Author SHA1 Message Date
Philippe Teuwen 03d994ea2c em stuff 2020-10-15 22:01:26 +02:00
Philippe Teuwen e4967ac654 use handle 2020-10-15 20:06:27 +02:00
iceman1001 df5c635a7d hook up 4x50 read for lua 2020-10-15 19:38:49 +02:00
iceman1001 4ba31596d5 adapt some tag identification of ats historical bytes 2020-10-15 19:30:49 +02:00
iceman1001 ba8aa6f0ab lf em stuff 2020-10-15 19:29:54 +02:00
tharexde f8045e0434 removed function call with timeout (initial call after starting pm3 client will always cause a timeout) 2020-10-14 19:59:55 +02:00
iceman1001 53c7e47e75 fix: hf iclass restore - now uses NG and better reporting and works :) 2020-10-14 17:41:34 +02:00
iceman1001 3868b0b4e6 hf iclass write, hf 15 raw, write, etc supports tear off trigger 2020-10-13 22:43:28 +02:00
tcprst 045f90ecf4
fix fido2 list/info 2020-10-13 11:19:18 -04:00
iceman1001 9a3c669e59 EM4x50 to exit if tear off 2020-10-13 14:05:18 +02:00
iceman1001 d8b2dc2ebf enable tearoff for LF EM 4x50_WRITE & EM_WRITE_PASSWORD 2020-10-13 14:00:03 +02:00
iceman1001 125548a44c hf mf rdsc - use fcts instead 2020-10-13 12:08:34 +02:00
iceman1001 14fd9a54df hf mf rdsc - use fcts instead 2020-10-13 12:07:33 +02:00
Iceman c40edaec82
Merge pull request #1010 from xianglin1998/master 
32 sector print incomplete for Mifare 4K
 2020-10-13 12:02:02 +02:00
iceman1001 597e069c50 remove HF ICLASS REPLAY, use HF ICLASS RDBL or HF ICLASS DUMP instead with option "n" 2020-10-13 11:54:38 +02:00
dxl 1bc1443731 32 sector print Incomplete for Mifare 4K(more) 2020-10-13 17:33:32 +08:00
dxl 1afddd2b12 32 sector print incomplete for Mifare 4K 2020-10-13 17:27:28 +08:00
dxl 334b3bfb77 fix text 2020-10-13 08:46:38 +02:00
dxl d3336ef842 fix text 2020-10-13 14:26:40 +08:00
Philippe Teuwen 782d36d312 add option to hf mfu cauth to keep field active 2020-10-12 23:41:44 +02:00
iceman1001 2235d96486 textual 2020-10-12 19:54:50 +02:00
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
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
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
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
iceman1001 0d0c42a56e hw tearoff - colors 2020-10-10 10:45:15 +02:00
iceman1001 fa2bde2876 textual 2020-10-10 10:35:50 +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 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 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 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 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
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 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 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 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 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 c528eacf24 wiegand cmds now use cliparse 2020-10-04 17:41:27 +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 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 12b3a7c236 fix: data mtrim - no crashing 2020-10-04 02:24:10 +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 2f0fec449b fix wrong param 2020-10-03 14:09:24 +02: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
iceman1001 01af87e6d7 hf 14b sniff, sim, info, - now uses cliparser 2020-10-02 18:06:21 +02:00
iceman1001 19a458e31e textual 2020-10-02 17:07:03 +02:00
iceman1001 67a672e6dc hf 14b sniff - wait for button press 2020-10-02 17:06:42 +02:00
iceman1001 206b699af4 hf 14b raw - adapt params 2020-10-02 16:53:03 +02:00
iceman1001 c3872e626b hf 14b raw -> now using cliparser. -s now has number to denote which select to use. 0,1,2 2020-10-02 15:26:10 +02:00
iceman1001 31f5502171 remade ASK C-ticket select to deviceside 2020-10-02 14:31:52 +02:00
iceman1001 9956c5af31 new ref to inclue 2020-10-02 14:31:11 +02:00
iceman1001 b2e58df807 new ref to inclue 2020-10-02 14:31:03 +02:00
Philippe Teuwen 67c175fe7a hf 14b reader: show actual ASK CTx UID 2020-10-02 02:56:29 +02:00
iceman1001 affd92f79a hf 14b reader - added simple ask ct detection 2020-10-02 01:29:21 +02:00
iceman1001 6fc3b9a4a7 -p refs - unify param 2020-10-01 00:31:27 +02:00
iceman1001 46e6ba5ded -p refs - unify param 2020-10-01 00:26:18 +02:00
iceman1001 eda78a3c81 hf 14a/b raw - unify param 2020-10-01 00:15:29 +02:00
iceman1001 e662ee8705 coverity 294114 2020-09-30 20:19:45 +02:00
iceman1001 980049270c coverity 301403 2020-09-30 20:14:13 +02:00
iceman1001 a77ce27a68 coverity 303144 2020-09-30 20:09:50 +02:00
iceman1001 4b8117cdb2 coverity 294394 2020-09-30 20:09:27 +02:00
iceman1001 c048e5cf13 hf 14b ndef - convert to cliparse 2020-09-30 19:48:53 +02:00
iceman1001 9140579735 hf 14b ndef - hooking up some steps 2020-09-30 19:42:50 +02:00
iceman1001 5ef142620d fix 14b apdu return 2020-09-30 19:21:03 +02:00
iceman1001 181bb3bc74 added: hf 14b apdu 2020-09-30 17:06:19 +02:00
Philippe Teuwen c3c59e35cb make style 2020-09-30 14:27:19 +02:00
iceman1001 6d62eb88d0 remove missleading msg 2020-09-30 12:18:26 +02:00
iceman1001 b84436caec rename public key 2020-09-30 12:14:04 +02:00
iceman1001 56614ef80c comments about 6D 00 responses seen in the wild 2020-09-30 12:10:27 +02:00
Iceman 58c8b45f12
Merge pull request #984 from mwalker33/cliparser 
cliparser - round 3
 2020-09-30 12:01:22 +02:00
mwalker33 9560773e8f cliparser - round 3 
updated cmdhfmfdes.c,  cmdhfmfp.c, cmdhfhfu.c, cmdlfindala.c and cmdlfmotorola.c
 2020-09-30 19:38:40 +10:00
iceman1001 a5ae725834 cleanbuffer before calling a sendcommand* fct 2020-09-30 10:25:57 +02:00
mwalker33 e724204978 cliparser cleanup 2 
cmdhf14a.c, cmdhfido.c, cmdhficlass.c, cmdhfmf.c
menu help updates.
cliparser.c : tweak for readability with long examples.
 2020-09-30 16:39:08 +10:00
mwalker33 561c5f779e cliparser cleaning 
checked cmdhf.c and cmddata.c and tweaked cliparser.c
 2020-09-30 07:55:51 +10:00
Philippe Teuwen d22ee1091b fix Presco demod 2020-09-29 00:36:35 +02:00
Philippe Teuwen 4e10c9ec0a move idteck to its own file 2020-09-28 21:09:26 +02:00
Philippe Teuwen a3282b940b Rename em 410x_write into 410x_clone 2020-09-28 20:31:45 +02:00
Msprg cc5a70ce6c
Alignment fix 2020-09-28 18:52:57 +02:00
Msprg 3a5c7430b5
Edited "protect" help text for more accuracy 
Yeah, I got nothing better to do, than just push fixes from discord.

Anyways, I think this should work...
 2020-09-28 18:11:40 +02:00
Philippe Teuwen dfb7eaf061 LF: rework internal APIs 2020-09-28 13:59:03 +02:00
iceman1001 99439a0869 lf colors 2020-09-28 10:19:27 +02:00
iceman1001 4c29781de7 hf 14b ndef - prepped the skeleton 2020-09-28 10:09:34 +02:00
mwalker33 fcb91fffa9 Update cmdlft55xx.c 
comment out place holder printf  statement used for test/dev
 2020-09-28 11:16:05 +10:00
tharexde c20ab4ca20 added function reset 2020-09-27 23:39:04 +02:00
tharexde 2e5cf12d7d added login function 2020-09-27 23:22:51 +02:00
tharexde ab8b5814b0 Merge branch 'dev-bruteforce_em4x50' into allin 
merge
 2020-09-27 19:55:42 +02:00
Ave d9ccd9ee24
hfmfdes: Fix a typo 2020-09-27 19:42:26 +03:00
Ave 9c5c00d620
Allow writes up to 256 bytes with mfdes writedata 
And change help text to say 256 instead of 0xFFFF.

Closes #977
 2020-09-27 19:40:13 +03:00
tharexde 037234bbbe Merge branch 'master' into dev-bruteforce_em4x50 
update
 2020-09-27 15:03:27 +02:00
tharexde 2dee47fe28 Merge branch 'master' into allin 
update
 2020-09-27 15:02:51 +02:00
tharexde fc3638a5f4 changed function name 2020-09-27 13:42:27 +02:00
tharexde 55ba7c695d new function CmdEM4x50BruteForce + hint for lsb notation regarding CmdEM450WritePassword 2020-09-27 12:58:13 +02:00
tharexde 688a2e741c new entry for function 4x50_bruteforce 2020-09-27 12:56:18 +02:00
tharexde 1492d38bd3 new entry for function 4x50_bruteforce 2020-09-27 12:55:35 +02:00
Iceman 65ec981eb4
Merge pull request #976 from tcprst/master 
add accurate detection for NT2H1311C1DTL
 2020-09-27 03:41:31 +02:00
tcprst ad19f83848
add accurate detection for NT2H1311C1DTL 2020-09-26 21:30:41 -04:00
iceman1001 91d01c1dcd textual 2020-09-27 02:22:40 +02:00
iceman1001 9eb46f528f hf 14b dump - autodetect memory size 2020-09-27 01:50:46 +02:00
iceman1001 3e67ad0b0f hf 14b reader - cleanup 2020-09-26 16:54:47 +02:00
iceman1001 e8b5ce9917 hf 14b reader - added some more "other" ways to get a 14b tag to answer 2020-09-26 16:52:48 +02:00
iceman1001 6926ca5f5a hf 14a info - hint for ST 2020-09-26 16:28:39 +02:00
iceman1001 88050f36fe hf mfu dump - added some hints 2020-09-26 14:54:34 +02:00
iceman1001 cfdadd8c47 hf 14b dump - unify lck bits as in mfu 2020-09-26 14:47:03 +02:00
iceman1001 71fd4193ad hf 14a info - adapt infineon and gen3 detection 2020-09-26 14:46:06 +02:00
iceman1001 a03888fd63 hf 14b dump - added lockbit information 2020-09-26 14:13:21 +02:00
Philippe Teuwen ef94ce3b25
Merge pull request #975 from mwalker33/white-cloner-pwd 
White cloner pwd
 2020-09-26 11:24:36 +02:00
mwalker33 ff21ca77f9 Update cmdlft55xx.c 
Clean up output
 2020-09-26 18:22:18 +10:00
iceman1001 b4728157fb fix return codes for 14b, sorting out status checks in client 2020-09-26 09:33:36 +02:00
mwalker33 e05a10f3e5 Update cmdlft55xx.c 
Use generator function
 2020-09-26 17:31:46 +10:00
mwalker33 131b587846 White Cloner Password 
Based on the findings of paleopterix
 2020-09-26 13:19:35 +10:00
Costantino Beretta 3f26e3c557 Removed an status check that was blocking command 'hf 14b dump', added SwapEndian64 to generated filename to be consistent with UID 2020-09-25 22:00:20 +02:00
iceman1001 259b47b909 coffee 2020-09-25 16:43:48 +02:00
Philippe Teuwen 5e26c096bb hw version: display firmware platform info 2020-09-25 16:42:54 +02:00
iceman1001 42eb98cdda rename 2020-09-24 23:20:15 +02:00
iceman1001 65478867d1 add check for NTAG413 2020-09-24 23:10:46 +02:00
tharexde e794c47303 Merge branch 'master' into allin 
update
 2020-09-24 23:08:04 +02:00
tharexde 9df747c3e1 new files 2020-09-24 23:05:11 +02:00
iceman1001 8e819f1b26 textual 2020-09-24 22:55:09 +02:00
iceman1001 cabe121ca8 lf help text 2020-09-24 19:51:57 +02:00
Philippe Teuwen e556b8de55 Fix NTAG I2C UID and signature verification 2020-09-24 15:03:38 +02:00
Philippe Teuwen 8c4076281e Fix PK secp224r1 display 2020-09-24 13:58:45 +02:00
iceman1001 a8185cc8d6 validate vivokey spark1, and more details 2020-09-24 13:15:23 +02:00
Philippe Teuwen caa4812f64 Add NTAG 213 TT support 2020-09-24 01:29:38 +02:00
Philippe Teuwen ea8bfacb57 textual 2020-09-24 01:00:34 +02:00
tharexde a27b3af4cb make style 2020-09-23 23:44:01 +02:00
tharexde 59483e8c3b Merge branch 'master' into allin 
update 23.9.2020
 2020-09-23 23:20:18 +02:00
Philippe Teuwen 7481d73263 typo 2020-09-23 21:03:08 +02:00
Philippe Teuwen 7d4c6e8faa Fix Gen3 detection bug against MFUL 2020-09-23 12:25:30 +02:00
Philippe Teuwen f6d7890802 initialize mful dumps 2020-09-23 11:49:51 +02:00
Philippe Teuwen 610b456a97 fix lau scripts renaming 2020-09-23 00:11:11 +02:00
tharexde 51651a1e0a Merge branch 'dev_standalone' into malsehn_standalone 2020-09-23 00:07:34 +02:00
Philippe Teuwen 6414e00f37 QT_VERSION in hex, sigh 2020-09-22 11:51:29 +02:00
Philippe Teuwen 5322b0c4a1 Tuning QT version quirks 2020-09-22 11:30:05 +02:00
Philippe Teuwen bc5c03f27f Fix for both QT4 and QT5 2020-09-22 01:24:14 +02:00
Philippe Teuwen 825b2aa7c3 Fix for both QT4 and QT5 2020-09-22 01:22:25 +02:00
Philippe Teuwen 6a805eaf33 Fix for both QT4 and QT5 2020-09-22 00:32:20 +02:00
Philippe Teuwen 8bbda87956 Fix deprecated QWheelEvent.x() 2020-09-22 00:15:43 +02:00
Philippe Teuwen 3ffd7384ae textual 2020-09-21 16:16:54 +02:00
Philippe Teuwen 2482a8ec06 data plot: support mouse wheel for moving and zooming (+shift) 2020-09-21 16:05:38 +02:00
Philippe Teuwen 804fef2ab8 data plot zoom around cursors 2020-09-21 14:54:31 +02:00
Costantino Beretta fe6cb9c3e7 'hf 14b dump' without params now calls help and corrected a typo 2020-09-20 14:25:28 +02:00
Philippe Teuwen 35e276f8ed Add options to 'lf sniff' for repeated acquisitions 2020-09-20 11:37:51 +02:00
Philippe Teuwen 5dc671f834 Add continuous mode to 'lf fdx read [@]' 2020-09-20 00:21:02 +02:00
tcprst 69cdf10350
rework ST25TA usage text to follow standards 2020-09-19 12:02:04 -04:00
tcprst 4d2b2f0c64
add ST25TA password change logic 2020-09-19 11:45:19 -04:00
iceman1001 4804069f05 fixes warnings 2020-09-19 15:04:57 +02:00
Iceman 403c9bdef4
Merge pull request #965 from tcprst/st25taverify 
add ST25TA ndef protection logic
 2020-09-19 12:59:37 +02:00
Iceman b05007398a
Merge pull request #967 from mwalker33/T55xx-Sniff 
Update cmdlft55xx.c
 2020-09-19 12:58:19 +02:00
mwalker33 95b25da910 Update cmdlft55xx.c 
re-work to imporve bit detection.
now works with keysy
 2020-09-19 19:52:04 +10:00
tcprst b7ad2cc5e5
add ST25TA ndef protection logic 2020-09-18 22:01:31 -04:00
iceman1001 8b2279dd05 fix a potential overflow 2020-09-18 19:50:45 +02:00
iceman1001 504b019e57 hf mf egetsc - some colors 2020-09-18 11:43:55 +02:00
iceman1001 e65b293043 add "hf mf egetsc", and renaming eget -> egetblk 2020-09-18 11:01:50 +02:00
iceman1001 f7e6327fdf coverity fixes 2020-09-17 23:08:49 +02:00
iceman1001 f00d9c22ef fix appveyor illegal byte 2020-09-17 23:08:29 +02:00
Philippe Teuwen 4ec7bca270 Add option to define extra symbols for 'lf cmdread', required e.g. for Hitag Micro and for talking to HT2 in emulation mode 2020-09-17 17:18:14 +02:00
mwalker33 a1738aee27 lf t55xx sniff - option fix 
change level samples to "s" and from buffer to "1"
 2020-09-17 18:26:59 +10:00
Philippe Teuwen 1a1c2bfee7 const payload_header_size 2020-09-17 10:13:58 +02:00
mwalker33 820031eb03 Update cmdlft55xx.c 
Update lf t55 sniff
Supports option to set min signal level and extra check for invalid data.
 2020-09-17 11:27:13 +10:00
mwalker33 2b2759e542 Update cmdlft55xx.c 
Add  lf t55xx sniff to attemp to extract commands sent from a cloner/writter.
 2020-09-17 09:49:03 +10:00
iceman1001 06dfa3c32d coffee 2020-09-16 15:29:14 +02:00
Philippe Teuwen c994323105 Unify 'lf read' and 'lf cmdread options', add options to cmdread 2020-09-16 12:59:42 +02:00
Philippe Teuwen 7621af2e88 ws: simplify 2020-09-16 09:19:41 +02:00
Philippe Teuwen 1208eb9e10 Add option for continuous mode to lf read, try e.g. data plot then lf read d 3000 s c 2020-09-16 02:38:28 +02:00
Philippe Teuwen 16ec5a96e0 ws: fix few bugs 2020-09-16 00:29:50 +02:00
Philippe Teuwen e15ebbe3d0 ws: generate only needed version and add option to save conversion to file 2020-09-15 23:59:53 +02:00
Philippe Teuwen 9209f8fb7f ws: another guess at width/height based on Android SDK decompilation 2020-09-15 23:00:22 +02:00
tcprst 6ac7d28283 add ST25TA64K chip model 2020-09-15 16:51:36 -04:00
Philippe Teuwen 32e04483fc ws 4.2 tested, thans @tcprst! 2020-09-15 20:01:41 +02:00
iceman1001 2ae3a84db6 remove debugstatement 2020-09-15 11:46:41 +02:00
iceman1001 102d8830a1 rothult - read and decode NDEF 2020-09-15 06:46:24 +02:00
iceman1001 754a4520fb spark1 public key 2020-09-15 06:02:24 +02:00
iceman1001 5e06eb9ca5 text 2020-09-15 04:34:55 +02:00
Philippe Teuwen 903d1a1d36 waveshare: add dithering 2020-09-15 01:25:15 +02:00
byron1901 8268be5390 hf mf autopwn: fix static nonce detection 2020-09-14 17:09:30 +01:00
Philippe Teuwen 3146305de1 waveshare: fix RGB for some screensizes 2020-09-14 09:48:33 +02:00
Philippe Teuwen 9247613c0b waveshare: fix dimensions 2020-09-14 01:54:31 +02:00
Philippe Teuwen 9751f62940 waveshare: swap some screen dimensions, to be tested... 2020-09-14 01:31:16 +02:00
Philippe Teuwen 6304003a7a waveshare: check image size 2020-09-14 01:16:28 +02:00
Philippe Teuwen b4aebd140a waveshare: fix multiple issues in BMP RGB handling 2020-09-14 00:18:51 +02:00
iceman1001 aa756aa493 fix #953 static nonce detection 2020-09-13 18:38:02 +02:00
Philippe Teuwen c62a721c22 hf 14a config : Add useful recipes to unbrick cards 2020-09-13 15:36:19 +02:00
iceman1001 407105b93a travis fix, bad define 2020-09-13 09:37:35 +02:00
Philippe Teuwen b92c9e845d waveshare: bugfix 2020-09-13 03:46:15 +02:00
Philippe Teuwen f828240af4 waveshare: clean code 2020-09-13 03:27:50 +02:00
Philippe Teuwen 25bad7259e remove redundant pragma 2020-09-13 01:51:58 +02:00
Philippe Teuwen b9329ce555 Add Waveshare support (bitmap ok, RGB maybe broken?) 2020-09-13 01:29:15 +02:00
iceman1001 8736f60fdc hf st info - more details GPO, Event 2020-09-12 15:11:43 +02:00
iceman1001 b16d895438 hf st info - more details GPO, Event 2020-09-12 15:00:50 +02:00
iceman1001 df60ba6b05 added basic support for Rothult ST cards 2020-09-12 14:23:04 +02:00
Philippe Teuwen 812d9cc46a style 2020-09-12 00:31:17 +02:00
Philippe Teuwen 3c9ca8f5bc 14a info: identify waveshare 2020-09-11 22:48:42 +02:00
Philippe Teuwen ecbcba18dd identify gen3 2020-09-11 18:17:58 +02:00
iceman1001 28ecc8fea8 renamed gen3, textual 2020-09-11 16:38:28 +02:00
iceman1001 c15101e45b add fflush back 2020-09-11 16:27:14 +02:00
iceman1001 5b695153b6 improved staticnonce tristate processing 2020-09-11 16:15:58 +02:00
Philippe Teuwen bc19a532a9 fix hf 14a raw to allow large timeouts 2020-09-11 15:11:37 +02:00
Philippe Teuwen e488ef306c Fix MFC static nonce detection on some cards and do it before prng det 2020-09-11 14:09:38 +02:00
iceman1001 68e6df84a4 t55 output 2020-09-11 11:02:19 +02:00
iceman1001 35029ea624 type 2020-09-10 21:02:02 +02:00
iceman1001 a5de8aa714 mixed messages 2020-09-10 20:50:14 +02:00
iceman1001 866f4b6313 hf 14a info - ntag21x identification 2020-09-10 20:40:12 +02:00
iceman1001 25c45ef659 textual 2020-09-10 16:20:29 +02:00
iceman1001 9db343b1c4 fix printfs coverity 298929, 298928 2020-09-10 14:01:55 +02:00
iceman1001 3221fb32a1 fixes for 36b format 2020-09-10 11:44:32 +02:00
iceman1001 9ced99a853 cident super card 2020-09-10 01:31:54 +02:00
iceman1001 2514ec740c uid 7 or 4 for desfire 2020-09-10 00:33:46 +02:00
iceman1001 420b29c7bf hf 14a sim t 10 - possibility to simulate IKEA rothult locks 2020-09-10 00:05:50 +02:00
iceman1001 131ffbcb6a trace list 15 - now prints block for write /read annotations better 2020-09-09 17:33:03 +02:00
iceman1001 539f33a3c9 warning gcc10.2 (@mwalker33) 2020-09-09 12:30:09 +02:00
iceman1001 d60b9859bf lf fdx clone, sim, demod - wrong bit, better naming and output 2020-09-09 12:19:26 +02:00
Philippe Teuwen 2af4a8957b Fix hf mfu setuid for cards requiring valid BCC 2020-09-09 10:37:57 +02:00
Iceman 2990dba14f
Merge pull request #949 from aveao/mfucompatwrite 
Introduce compatible write support to hf mfu wrbl
 2020-09-08 23:27:41 +02:00
iceman1001 64e68cd158 need flush to print those dots 2020-09-08 11:27:20 +02:00
Ave 19f5639107
hf mfu wrbl: Extend help text 
and do style pass
 2020-09-07 22:38:11 +03:00
Ave f1146d360f
Introduce compatible write support to hf mfu wrbl 2020-09-07 22:34:44 +03:00
Philippe Teuwen e3b8e868ea hf 14a config: force RATS 2020-09-07 15:09:24 +02:00
iceman1001 5d6f8053c6 textual 2020-09-07 12:11:21 +02:00
Iceman 039098ef96
Merge pull request #947 from aveao/mydmovedumpfix 
Fix last block of dumps on my-d move/move lean
 2020-09-07 11:35:44 +02:00
Philippe Teuwen 7b763353f7 hf mf cview/csave: fix mfc 4k bug 2020-09-07 11:30:25 +02:00
iceman1001 5d357a6039 style 2020-09-07 10:39:15 +02:00
Ave 95cf57138c
Fix last block of dumps on my-d move/move lean 2020-09-07 11:38:05 +03:00
iceman1001 0be35a8e7e style 2020-09-07 10:35:09 +02:00
Philippe Teuwen 2fc36d73c9 hf 14a config: better options 2020-09-07 10:24:12 +02:00
Philippe Teuwen b751354ea2 hf 14a: add config loopholes to deal with badly configured cards: invalid ATQA, invalid BCC, invalid SAK 2020-09-07 00:50:27 +02:00
iceman1001 a1b37179ca mikron JSC russan ev1 @mceloff 2020-09-06 21:49:55 +02:00
iceman1001 718e6d2ce8 hf legic sim -> text, use NG, report back 2020-09-06 21:41:04 +02:00
Philippe Teuwen 3d18f44d35 hf search output: simplify prompt handling 2020-09-06 17:48:01 +02:00
Philippe Teuwen 97a7349510 hf search: fix 'no tag found' message display 2020-09-06 17:41:55 +02:00
iceman1001 e524c3e89e less messages in t55xx 2020-09-06 17:02:51 +02:00
iceman1001 e0b491fc76 less messages 2020-09-06 17:00:21 +02:00
iceman1001 57ea5f3ef1 7816 also does 14a annotations 2020-09-06 11:32:03 +02:00
iceman1001 e1365ba334 PPS in annotation 2020-09-06 11:31:23 +02:00
iceman1001 2168d3ea7d textual 2020-09-06 11:09:44 +02:00
Iceman 4437148a49
Merge pull request #945 from McEloff/hf_mf_magic_gen3 
Magic gen 3 cards support
 2020-09-06 00:47:34 +02:00
iceman1001 6da92df6cc for testing, increase to 10000 2020-09-06 00:07:14 +02:00
iceman1001 b98b51c279 textual 2020-09-05 23:57:44 +02:00
iceman1001 2d7eca08a2 textual 2020-09-05 23:57:06 +02:00
iceman1001 e8d829218d do stupid stuff, win stupid prices 2020-09-05 22:05:59 +02:00
Eloff 70be7ef4d8 Magic gen 3 cards support 2020-09-05 22:32:11 +03:00
tharexde c49e2d7ba9 solved 2020-09-05 13:25:57 +02:00
iceman1001 57975d8ada textual 2020-09-05 10:54:00 +02:00
iceman1001 fa532a0e1b dont check KEYB if KEYA dumped it all 2020-09-05 08:19:25 +02:00
iceman1001 137517111f clear emulator mem before fillig it 2020-09-05 08:03:29 +02:00
Philippe Teuwen 9814aa56e1 Switch to 134kHz for 2020-09-05 00:12:38 +02:00
iceman1001 4893bce4b5 more logging 2020-09-03 10:32:19 +02:00
iceman1001 247dfd40b2 unified ST printing for rdbl, rdsc, cgetblk, cgetsc 2020-09-02 15:09:23 +02:00
iceman1001 e03d7e3894 hf mf autopwn - moved generate filename call 2020-09-02 13:22:07 +02:00
iceman1001 8097faa449 better looping for when to enter staticnested 2020-09-02 12:37:45 +02:00
iceman1001 0a6ec76f65 textual 2020-09-02 12:18:24 +02:00
iceman1001 7232d3a7a8 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-09-02 12:18:03 +02:00
iceman1001 71fc3e18d9 fixing return codes for Autopwn, added staticnested to autopwn 2020-09-02 12:16:11 +02:00
Gator96100 cb55e256e3 Registry entries are not needed when calling SetConsoleMode 2020-08-31 14:41:40 +02:00
iceman1001 ff5f565619 redirect LUA print to Proxmark PrintAndLogEx 2020-08-31 11:36:35 +02:00
iceman1001 2089edbba9 adapt chunksize as we progress 2020-08-31 03:05:18 +02:00
iceman1001 11695eb55c textual 2020-08-31 01:16:56 +02:00
iceman1001 91a79c2318 added: hf iclass eview 2020-08-30 09:55:57 +02:00
iceman1001 4cb6e0d42e remore magic wipe 2020-08-30 02:08:17 +02:00
iceman1001 e3da69410b reenable manual wipe 2020-08-30 02:06:07 +02:00
Philippe Teuwen aee5528fbd Add hf mf eview 2020-08-30 01:48:42 +02:00
iceman1001 dec5c3fa97 textual for @doegox and @jirvin 2020-08-30 01:29:43 +02:00
iceman1001 63b92a3782 hf mf cview 2020-08-30 01:14:50 +02:00
iceman1001 62d734dbfc hf mf cview 2020-08-30 01:12:27 +02:00
iceman1001 85b3687ae5 hf mf cview 2020-08-30 01:10:52 +02:00
iceman1001 5b6bd2fcba add "hf mf cview" 2020-08-30 01:04:18 +02:00
iceman1001 bf3f2da73d link in file 2020-08-29 17:27:55 +02:00
iceman1001 bb92658792 no printf 2020-08-29 16:21:17 +02:00
iceman1001 941c6f5d25 no printf 2020-08-29 16:06:08 +02:00
iceman1001 dab9554ed9 no printf 2020-08-29 16:00:27 +02:00
iceman1001 c502b1a4f1 no printf 2020-08-29 15:55:15 +02:00
iceman1001 30c0f85760 no printf, no sprintf 2020-08-29 15:35:16 +02:00
iceman1001 a6ab383d1d no printf, no sprinft, enabled Ev3 detection 2020-08-29 15:30:11 +02:00
iceman1001 11052fabf7 no printf 2020-08-29 15:22:26 +02:00
iceman1001 2f86958451 no sprintf 2020-08-29 15:12:57 +02:00
iceman1001 502fbeeaab no printf 2020-08-29 15:12:19 +02:00
iceman1001 ab3e9983f8 no printf 2020-08-29 15:03:56 +02:00
iceman1001 d09ed2eec0 no printf 2020-08-29 14:57:05 +02:00
iceman1001 7fd4d5f158 no printf 2020-08-29 14:52:11 +02:00
iceman1001 cccee38597 no printf 2020-08-29 14:48:41 +02:00
iceman1001 110a173e6d no printf 2020-08-29 14:38:46 +02:00
iceman1001 cbd35c49a6 no printf 2020-08-29 14:33:35 +02:00
iceman1001 631a4e853a no printf 2020-08-29 14:31:09 +02:00
iceman1001 32452dec4b no printf 2020-08-29 14:29:07 +02:00
iceman1001 43803947c3 no printf 2020-08-29 14:21:09 +02:00
iceman1001 da3e5dff82 no printf, sprintf 2020-08-29 14:17:05 +02:00
iceman1001 10c64d755d no printf, sprintf 2020-08-29 14:13:18 +02:00
iceman1001 7336906923 no printf 2020-08-29 14:05:13 +02:00
iceman1001 f79a4803c5 no printf 2020-08-29 14:04:01 +02:00
iceman1001 92442dcbef no printf 2020-08-29 14:01:15 +02:00
iceman1001 7c3e8335c3 no printf 2020-08-29 14:00:18 +02:00
iceman1001 f31aea23bd no printf 2020-08-29 13:58:48 +02:00
iceman1001 7b14c98530 printf remove 2020-08-29 11:58:36 +02:00
iceman1001 04c5091018 printf remove 2020-08-29 11:57:31 +02:00
iceman1001 a34b9293e8 printf remove 2020-08-29 11:55:36 +02:00
iceman1001 7bd008dde3 analyze freq, calculates wavelengths. 2020-08-29 11:31:03 +02:00
iceman1001 0270a25808 no printf 2020-08-28 19:24:10 +02:00
iceman1001 b5440f1f3d no printf 2020-08-28 19:17:11 +02:00
iceman1001 5c343f6537 adapt Q5/T5555 for nedap clone 2020-08-28 19:05:05 +02:00
iceman1001 57feefcfcb textual Q5 2020-08-28 15:57:15 +02:00
iceman1001 1f8bad3798 textual Q5 2020-08-28 15:53:34 +02:00
iceman1001 96819da54a textual Q5 2020-08-28 15:50:23 +02:00
iceman1001 5cc9705ccf textual Q5 2020-08-28 15:45:55 +02:00
iceman1001 e182e80557 textual Q5 2020-08-28 11:27:53 +02:00
iceman1001 15df8d1ce7 textual Q5 2020-08-28 11:23:04 +02:00
iceman1001 290eddddc6 textual Q5 2020-08-28 11:14:42 +02:00
iceman1001 e9fd336902 textual Q5 2020-08-28 11:08:59 +02:00
iceman1001 be9f7eda37 textual 2020-08-28 11:02:34 +02:00
iceman1001 7098618ad8 textual 2020-08-28 10:49:13 +02:00
iceman1001 5a8f7d5c74 keri clone - q5 should use RF/32, thanks @mwalker33! 2020-08-28 10:38:36 +02:00
iceman1001 3cc722e44c Q5/T5555 has a fix 06 first byte in the configblock. Thanks @mwalker33! 2020-08-28 10:11:11 +02:00
iceman1001 967c2fe6f9 Q5/T5555 has a fix 06 first byte in the configblock. Thanks @mwalker33! 2020-08-28 10:08:18 +02:00
iceman1001 aadd22da51 Q5/T5555 has a fix 06 first byte in the configblock. Thanks @mwalker33! 2020-08-28 10:06:21 +02:00
iceman1001 b16b71944a Q5/T5555 has a fix 06 first byte in the configblock. Thanks @mwalker33! 2020-08-28 10:05:15 +02:00
iceman1001 cda72aef40 Q5/T5555 has a fix 06 first byte in the configblock. Thanks @mwalker33! 2020-08-28 10:03:33 +02:00
iceman1001 af1bf08e33 lf search - a bit more verbose when looking for motorola / cotag (noice) which takes longer time 2020-08-28 07:59:25 +02:00
iceman1001 bf77599fda lf keri demod - q5 has less decoded bytes 2020-08-28 07:57:23 +02:00
iceman1001 d6e3366c43 mix->ng 2020-08-26 14:37:39 +02:00
iceman1001 3776b2ed6b dont forget these ones 2020-08-26 12:46:16 +02:00
iceman1001 42d1a20dc9 renaming 2020-08-26 12:28:43 +02:00
iceman1001 32c614db7b fix cotag memory bugs. was off-by-one 2020-08-25 15:34:10 +02:00
iceman1001 6d5b12a7b3 coverity fix, wrong printf args 2020-08-23 15:27:31 +02:00
iceman1001 ccad4a6559 lf t55xx chk - change parameter for i to f 2020-08-22 08:18:27 +02:00
iceman1001 1f1eff5687 textual 2020-08-21 23:16:15 +02:00
iceman1001 41375a1d09 cleaner banner 2020-08-21 17:58:07 +02:00
iceman1001 4a09a1e17f textual 2020-08-21 17:15:58 +02:00
iceman1001 fde22a3980 textual 2020-08-21 16:47:18 +02:00
iceman1001 e3767a3e28 lf t55 chk m (works again!). lf t55 config (prints correct pwd if used) 2020-08-21 14:10:32 +02:00
iceman1001 bba5de517a iclass save to json now have more verbose file 2020-08-19 21:52:12 +02:00
iceman1001 508151ee3a hf iclass list - now tries to recovery key 2020-08-19 21:51:10 +02:00
iceman1001 1689a73101 hf iclass chk , textual 2020-08-18 11:11:43 +02:00
iceman1001 6b8c5e0d24 adapting epa cnonces 2020-08-17 22:06:54 +02:00
iceman1001 e0c5995ab2 fix hf14braw 2020-08-17 22:04:35 +02:00
iceman1001 179ef4cf84 f 2020-08-17 14:05:15 +02:00
iceman1001 b941e6aab9 fix #874 - 14a, mifare, shows bits if a partial byte 2020-08-17 12:35:42 +02:00
iceman1001 0f94fa5a54 fix coverity 298566 2020-08-17 09:01:18 +02:00
iceman1001 2be85939f7 fix: hf 15 cetsuid. hf 15 sim 2020-08-17 08:52:24 +02:00
iceman1001 4cc30de788 textual 2020-08-16 21:32:16 +02:00
iceman1001 7c9711eb08 14b colors 2020-08-16 21:14:37 +02:00
iceman1001 49aa198c88 annotate cryptorf 2020-08-16 09:59:41 +02:00
iceman1001 006f9c4f20 disable felica in hf search until it is more stable 2020-08-15 11:54:13 +02:00
iceman1001 4965f40c24 14b, handle sof 2020-08-15 11:03:59 +02:00
iceman1001 2c29f95077 annotation 15 only when we got bytes 2020-08-15 11:02:06 +02:00
iceman1001 b12727349b fix timeout for hf 15 info/reader 2020-08-15 10:59:21 +02:00
iceman1001 b3348a74e9 textual 2020-08-15 08:49:39 +02:00
iceman1001 edc9727e4b make travis happy 2020-08-14 19:26:44 +02:00
iceman1001 eaf0ecfe6e trace list 15 annotation 2020-08-14 14:57:30 +02:00
iceman1001 ede0059b10 more params 2020-08-14 14:57:02 +02:00
iceman1001 61201a3aaf textual 2020-08-14 14:55:07 +02:00
iceman1001 cf36e26add hf 15 client side got some love 2020-08-14 14:54:47 +02:00
iceman1001 2b903a77bd really fix dt_dir on proxspace 2020-08-14 06:31:19 +02:00
iceman1001 6921fdafde fix DT_DIR on mingw / proxspace 2020-08-14 05:44:40 +02:00
Philippe Teuwen b59becbeb6 Add LF before first pm3 dbg msg when there is a pending prompt 2020-08-14 00:14:46 +02:00
Philippe Teuwen 6d3c1d0223 script list: recurse in subdirs 2020-08-13 23:10:11 +02:00
Philippe Teuwen 80d9b4c5de PrintAndLogEx: Allow to skip carriage return by appending NOLF 2020-08-13 23:10:11 +02:00
iceman1001 6bd0138f14 add a clear screen for ansi enabled terms 2020-08-13 17:42:46 +02:00
iceman1001 700f0624a4 coverity 298509, 298508, 294394 2020-08-13 14:04:09 +02:00
Philippe Teuwen 4ed57c7c4d make style 2020-08-13 12:25:04 +02:00
iceman1001 8a602ed99d coverity 294114 2020-08-13 12:21:40 +02:00
Philippe Teuwen 85fd28eb2c fix SKIPREADLINE compilation err 2020-08-13 09:42:50 +02:00
iceman1001 27553ba34a less cpu usage, thanks @mwalker33 2020-08-13 09:04:02 +02:00
iceman1001 042caabe12 iclass replay params 2020-08-12 13:18:59 +02:00
iceman1001 483fed90fe hf iclass replay works. A bit bad in not reading AA2. Assumes a KD mac 2020-08-11 23:46:11 +02:00
iceman1001 ffa27049b7 chg: trace list color in list 2020-08-11 21:39:51 +02:00
iceman1001 c1a5f93dab send arguments to standalone mode 2020-08-08 23:45:09 +02:00
iceman1001 ccbfdf9e88 add: mem spiffs wipe 2020-08-08 12:33:12 +02:00
iceman1001 146c8f4e8e dump size bugs 2020-08-08 11:46:22 +02:00
iceman1001 4698e9a595 print lock bit for block 2020-08-06 08:14:40 +02:00
iceman1001 62d9b403b4 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 into fpga 2020-08-03 21:22:13 +02:00
iceman1001 d93364bc22 textual chk, loopup. Sim working on reva,b,c readers 2020-08-03 17:42:05 +02:00
iceman1001 53b9bd37c2 sorted 2020-08-03 17:39:31 +02:00
iceman1001 7236762cd6 help commands grouped 2020-08-03 17:38:58 +02:00
Philippe Teuwen 00938e06ff Fix btpin usage 2020-08-02 11:29:21 +02:00
iceman1001 3581cd6d4c textual 2020-07-29 15:28:42 +02:00
iceman1001 e147bdc71b renamed readtagfile to view\nrenamed clone to restore\nrefactored reader, info, dump, rdbl, wrbl to be on device side. Commands now also seamless works with NON_SECURE_MPAGE 2020-07-29 11:02:30 +02:00
iceman1001 445d5a46df less logs 2020-07-29 10:19:48 +02:00
iceman1001 c5c3d819d5 helptext update 2020-07-23 11:27:25 +02:00
iceman1001 06c02d3b40 added iclass esave, textual 2020-07-21 14:09:05 +02:00
iceman1001 a85fd925b7 colors to wiegand decode 2020-07-21 13:01:19 +02:00
iceman1001 1f2c03ce8a iclass rdbl textual 2020-07-21 13:00:52 +02:00
iceman1001 ca14b92dd5 iclass info - some cards configured to take all available mem. ie no AA2 area. 2020-07-21 10:53:19 +02:00
iceman1001 e94cbd8da5 list 15693 2020-07-21 10:48:29 +02:00
iceman1001 0f5e58a81c fix iclass sof tracelog 2020-07-20 17:42:10 +02:00
iceman1001 2d368ba2d8 fix sim reply 2020-07-20 00:52:46 +02:00
iceman1001 20ad16bfca fix iclass dump.. 2020-07-19 23:09:21 +02:00
iceman1001 a1529b44ca fix auth and 2020-07-19 20:45:47 +02:00
iceman1001 1f3e671443 fix #905 - memory corruptions when generating filename 2020-07-16 10:54:30 +02:00
iceman1001 85be784d26 ev3 detection enabled 2020-07-15 11:55:21 +02:00
iceman1001 d9571d8df7 loclass, print helptxt 2020-07-15 11:35:03 +02:00
iceman1001 c99ed14c6e textual 2020-07-15 01:29:44 +02:00
iceman1001 5039d69c6b rename fct 2020-07-14 23:12:54 +02:00
iceman1001 091f9fb94c chg: adapt the eml block size based on filename 2020-07-14 23:11:44 +02:00
iceman1001 889d1c93cb fix: coverity mem leak 2020-07-14 15:25:56 +02:00
iceman1001 0f507c24e1 chg: readblock assuming better 2020-07-14 00:16:25 +02:00
iceman1001 2fa9bd585f style 2020-07-13 22:06:50 +02:00
iceman1001 4493153dbb verbose.. 2020-07-13 20:58:24 +02:00
iceman1001 b62c060727 chg: hf iclass rdbl, wrbl - got some love 2020-07-13 20:13:25 +02:00
iceman1001 88c14b9c08 iclass doesnt need 4500 timout anymore, can put earlier in hf search. 2020-07-13 18:20:43 +02:00
iceman1001 aaa6f25ab6 chg: 'trace list' - now support relative times, us/fc (@piwi) 2020-07-13 13:55:19 +02:00
iceman1001 52e9d7a750 rework iclass dump 2020-07-13 12:29:31 +02:00
iceman1001 e055858fb8 clean up 2020-07-13 12:25:44 +02:00
iceman1001 f866a847fb fix coverity 294114 2020-07-11 20:46:37 +02:00
Philippe Teuwen eb61524923 Merge branch 'master' into fpga 
* master: (27 commits)
  fix a bug in demodParadox()
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  added new command "4x50_wipe"
  fix #833  - missing some configblocks and spelling
  remove verichip.
  chg 'lf t55xx info' - detection of t55x7 configuration blocks
  remove
  disable verichip stuff.  should be inside FDX already
  textual
  lf t55 configblock detection updated
  textual
  fix: missing define on some mingw
  chg: hf mf decrypt - helptext (thanks @AdamLaurie)
  Update bt_manual_v10.md
  textual
  ...
 2020-07-11 15:25:20 +02:00
Iceman 7106b48065
Merge pull request #834 from tharexde/4x50_wipe 
added 4x50_wipe
 2020-07-11 09:47:41 +02:00
jumpycalm 23a5beb3c3 fix a bug in demodParadox() 2020-07-10 23:22:52 -04:00
iceman1001 a25a5322dd fpga: added iCLASS on deviceside 2020-07-10 16:37:56 +02:00
iceman1001 1feb34617b hunting down why logtrace is missing 2020-07-09 19:43:00 +02:00
iceman1001 b627d91fc2 adapt 2020-07-09 19:42:34 +02:00
tharexde 1394ffc3a0 added new command "4x50_wipe" 2020-07-09 02:00:09 +02:00
tharexde 9d8c7a8de5 added new command "4x50_wipe" 2020-07-09 01:58:50 +02:00
tharexde a659e7576d added new command "4x50_wipe" 2020-07-09 01:58:38 +02:00
iceman1001 d67bc94e20 hf iclass sniff 2020-07-09 00:21:26 +02:00
iceman1001 8934fd522d fix #833 - missing some configblocks and spelling 2020-07-08 20:30:53 +02:00
iceman1001 c56245d1aa chg 'lf t55xx info' - detection of t55x7 configuration blocks 2020-07-08 18:04:51 +02:00
iceman1001 327af5764d remove 2020-07-08 17:37:35 +02:00
iceman1001 2fcc9b07ef disable verichip stuff. should be inside FDX already 2020-07-08 17:37:01 +02:00
iceman1001 584fe52153 lf t55 configblock detection updated 2020-07-08 13:41:38 +02:00
iceman1001 aa0baa26c6 fix: missing define on some mingw 2020-07-08 11:09:20 +02:00
iceman1001 ce24e6acbb fpga merge hell, all compiles 2020-07-08 09:45:49 +02:00
iceman1001 fef3a764ae chg: hf mf decrypt - helptext (thanks @AdamLaurie) 2020-07-07 15:36:51 +02:00
iceman1001 d83a45f0cb fpga merge changes 2020-07-06 15:16:00 +02:00
iceman1001 ae8be54fca clean 2020-07-06 05:43:38 +02:00
iceman1001 927cd71ed9 use reflect fct 2020-07-06 05:43:12 +02:00
iceman1001 7d3cab1669 clean 2020-07-06 05:42:43 +02:00
iceman1001 9d204897d1 fix #830 - 'lf em 4x50_info/read' - now print msb and lsb again. 2020-07-06 05:41:44 +02:00
iceman1001 7d1a278197 merge hell p.x 2020-07-03 21:33:17 +02:00
iceman1001 e6c046e17c adapt banner to smaller views 2020-07-01 12:31:57 +02:00
iceman1001 1ec2a83e39 style 2020-06-30 18:50:38 +02:00
iceman1001 88d4d037f1 enable EV3 tests 2020-06-30 17:59:35 +02:00
iceman1001 aa0b3c67ba chg: lf em 4x50_write - output flow 2020-06-30 17:59:06 +02:00
iceman1001 86bfdcf260 chg: lf em 4x50_read / info - remake output 2020-06-30 17:43:47 +02:00
iceman1001 a3a7f0d4ad hw tia, status - textual 2020-06-30 12:50:31 +02:00
tharexde 9c263b3fb8 fixed simple compilation errors 2020-06-30 01:51:24 +02:00
tharexde da44e0fc96 Merge branch 'master' into dav-tmp 
solved merge conflict
 2020-06-30 01:05:10 +02:00
iceman1001 2abd7e08b4 chg: disable ctrl-c on mingw/ps 2020-06-29 22:23:46 +02:00
iceman1001 8d7a0c7fc7 pref show - textual 2020-06-29 18:16:28 +02:00
iceman1001 2fe42173de chg: when pressing ctrl-c, the command history is saved 2020-06-29 18:10:40 +02:00
iceman1001 ac12a892b0 fix coverity 290964, 286679, 286658, 286652 2020-06-29 12:11:17 +02:00
iceman1001 a6cc73a4d5 fix coverity 293468 2020-06-29 11:58:24 +02:00
iceman1001 714652b1f2 fix coverity 226321 2020-06-29 11:56:56 +02:00
iceman1001 a9b2752673 fix coverity 292483 2020-06-29 11:56:18 +02:00
iceman1001 e6bb7a8a87 fix coverity 292481 2020-06-29 11:32:38 +02:00
iceman1001 d5b379207e fix coverity 2020-06-29 11:22:09 +02:00
iceman1001 682de4eee0 fix coverity 290962, 290961 2020-06-29 11:21:46 +02:00
iceman1001 5d08dae554 fix coverity 290769, 290768 2020-06-29 11:10:02 +02:00
iceman1001 b5b5520546 fix coverity 286922 2020-06-29 10:42:22 +02:00
iceman1001 29a4a888a4 fix coverity 290965 2020-06-29 10:32:35 +02:00
iceman1001 8fd4bb6e33 preparing ndef command for desfire 2020-06-29 10:29:12 +02:00
iceman1001 8bd1a44ba7 textual 2020-06-29 10:26:58 +02:00
iceman1001 18ca4cb883 textal 2020-06-29 10:26:27 +02:00
iceman1001 4eb7776a07 text and cleanup 2020-06-29 10:25:51 +02:00
Iceman 7df20bc61e
Merge pull request #822 from tharexde/dev-em4x50_sread 
EM4x50 function "sread" (standard/selective read)
 2020-06-29 10:10:53 +02:00
iceman1001 f57a304362 fix #823 2020-06-29 08:05:43 +02:00
tharexde 844efbb9ac Merge branch 'master' into dev-em4x50_sread 2020-06-28 21:50:37 +02:00
tharexde 9aafc094b6 deleted nearly all EM4x50 code; new EM4x50 code is in 'cmdlfem4x50.c' (device side instead GraphBuffer) 2020-06-28 21:43:13 +02:00
tharexde 78511df9f2 integrated 'lread' into 'lf search' process and renamed 'lread' to 'read' 2020-06-28 21:41:21 +02:00
tharexde 91ff0350df introduced 'IfPm3EM4x50' function 2020-06-28 21:39:59 +02:00
tharexde c572a2bab8 introduced 'IfPm3EM4x50' function 2020-06-28 21:39:27 +02:00
tharexde a01c5aff0e deleted EM4x50 functions due to switch to new 'read' function for EM4x50 tag (device side) 2020-06-28 21:37:12 +02:00
tharexde c6435d2f96 output changes due to integration of 'read' into 'lf search' process 2020-06-28 21:35:06 +02:00
tharexde 955c7a642d renamed 'sread' to 'read' 2020-06-28 21:33:37 +02:00
iceman1001 fe3e77915d hf iclass reader - output redesign 2020-06-28 19:13:01 +02:00
iceman1001 b300899f8c hf 14a info - MIFARE DESFire MF3ICD40 detection 2020-06-27 18:14:29 +02:00
tharexde 81cd478883 Merge branch 'master' into dev-em4x50_sread 
update
 2020-06-27 00:37:32 +02:00
tharexde f264473b69 formal adjustments 2020-06-27 00:21:56 +02:00
iceman1001 d4b752e23b text 2020-06-26 23:53:34 +02:00
iceman1001 5e7911becb text 2020-06-26 23:50:36 +02:00
iceman1001 e7514ecbc0 text 2020-06-26 23:50:22 +02:00
iceman1001 2aa7c8f660 textual 2020-06-26 23:31:32 +02:00
iceman1001 06aecb09b7 chg: hf iclass reader - textual 2020-06-26 22:20:32 +02:00
iceman1001 5cce99db99 cleaning 2020-06-26 21:50:49 +02:00
iceman1001 71e30a8c4f layout 2020-06-26 21:49:50 +02:00
iceman1001 669bb1d597 client/src/cmdhficlass.c 2020-06-26 21:49:19 +02:00
iceman1001 f330f3925b text 2020-06-26 18:33:56 +02:00
tharexde e1f571e8da forgot to terminate string variable 2020-06-26 14:58:08 +02:00
tharexde 445a367b49 added 4x50_sread 2020-06-26 14:21:09 +02:00
tharexde 871fa6b733 added 4x50_sread 2020-06-26 14:20:46 +02:00
tharexde 8376b67ea0 added 4x50_sread 2020-06-26 14:20:19 +02:00
iceman1001 42415e41ab text 2020-06-26 13:23:37 +02:00
iceman1001 c65c683d06 text 2020-06-26 13:21:32 +02:00
iceman1001 ba8f60298a text 2020-06-26 13:17:41 +02:00
iceman1001 5643eb685d text, color 2020-06-26 13:01:17 +02:00
iceman1001 dbc2fb188a text,color 2020-06-26 12:02:57 +02:00
iceman1001 9ad944c4a1 color,text 2020-06-26 12:02:32 +02:00
iceman1001 f4c91bc3aa space 2020-06-26 00:43:56 +02:00
iceman1001 6484bd641c textual 2020-06-26 00:04:41 +02:00
Iceman 845d6a445c
Merge pull request #820 from aczid/master 
Show usage menu for invalid/missing hitag commands
 2020-06-25 23:45:30 +02:00
Aram 7c2fe1e8e6 Show usage menu for invalid/missing commands 2020-06-25 21:09:18 +02:00
Monster 173c1702e9
Add support for new "Mikron JSC Russia" UL tag. 2020-06-25 12:15:51 +03:00
iceman1001 c2df7ed824 chg: trigger colorsmode (proxspace) in direct calls to client 2020-06-24 11:51:00 +02:00
Bjoern Kerler 36fcb8ef2b Fixes num_keys 2020-06-24 07:22:03 +02:00
iceman1001 d06029c63f textual 2020-06-23 11:24:00 +02:00
iceman1001 1c7de4a8c3 fix: "lf search" / "lf hitag" - no more stack overflow in hitag reader 2020-06-23 11:13:49 +02:00
tharexde 3b7d654553 increased readability by introducing defines 2020-06-23 00:36:19 +02:00
tharexde cdb57c9c2b Merge branch 'master' into dev_em4x50_info_write 
merge conflict
 2020-06-22 21:04:48 +02:00
iceman1001 fddf8ae6aa textual 2020-06-22 18:04:40 +02:00
iceman1001 f900b1078e textual 2020-06-22 18:00:20 +02:00
iceman1001 b59131d349 chg: 'lf em/hid/io/awid watch' - colors, unified, NG 2020-06-22 14:56:13 +02:00
iceman1001 683954316a chg: 'lf em 410x_watch' - now uses NG and on deviceside only 2020-06-22 13:24:33 +02:00
iceman1001 ba6bc0ecef chg: 'lf io watch' - uses NG and reports back to client 2020-06-22 12:57:28 +02:00
iceman1001 18da534554 chg: 'hf sniff' - now malloc and is interupable 2020-06-21 18:13:14 +02:00
iceman1001 a93053c573 textual 2020-06-21 16:40:12 +02:00
iceman1001 2bc64e997f renamed sc to smart, and colors. 2020-06-21 16:36:12 +02:00
iceman1001 56e171b9dc chg: data ndef - now decodes w and wo NDEF header 2020-06-21 16:34:56 +02:00
tharexde 26b7c667b7 deleted function check_bit_in_byte(...) -> overhead 2020-06-20 18:38:44 +02:00
tharexde dc69880801 minor text and color changes 2020-06-20 14:44:24 +02:00
tharexde 9e2e1db6e1 changes due to replaced reply command (reply_mix(...) -> reply_ng(...)) 2020-06-20 14:33:49 +02:00
Philippe Teuwen f69739da79 make style 2020-06-19 18:34:47 +02:00
tharexde d8d56d9e74 corrected comments 
used param_gethex(...) and param_getdec(...) instead of scanf and strncpy constructs
 2020-06-19 01:22:39 +02:00
Philippe Teuwen f1ae469cd7 readline tuning 2020-06-18 21:36:20 +02:00
Philippe Teuwen 35cfd4931f remove debug statement 2020-06-18 17:55:09 +02:00
tharexde 171bf6912b deleted function msb2lsb 2020-06-18 13:53:25 +02:00
iceman1001 e1f0f89240 chg: 'hf sniff' - remake to mallc and report back size, also use NG 2020-06-18 11:54:19 +02:00
iceman1001 be9a5920d8 chg: downloading samples more fine grained 2020-06-18 11:05:21 +02:00
tharexde 0d61572f6d replaced old "SendCommandMIX" by "SendCommandNG" 2020-06-17 23:50:52 +02:00
tharexde daa39dff0e replaced function msb2lsb(...) by already existing function reflect8(...) 2020-06-17 23:39:00 +02:00
tharexde 572cc7c63e replaced "passed" by "ok" 2020-06-17 23:22:03 +02:00
tharexde 25b0c2e1eb replaced blue color by green or yellow 2020-06-17 23:20:10 +02:00
tharexde d684347429 changed timeout return value from PM3_ESOFT to PM3_ETIMEOUT 2020-06-17 23:13:13 +02:00
tharexde 89f15432b0 Merge branch 'master' into dev_em4x50_info_write 
update
 2020-06-16 23:32:56 +02:00
tharexde e81999da1a added write and write_password functions 2020-06-16 23:28:09 +02:00
tharexde 4023c2b8f9 added write and write_password functions 2020-06-16 23:25:27 +02:00
tharexde 0ddcab51aa added write and write_password functions 2020-06-16 23:25:17 +02:00
iceman1001 2555f46328 chg: "lf em 4x50_read" - acquire data is useful... 2020-06-16 09:24:39 +02:00
iceman1001 fd5f821a46 helptext 2020-06-16 09:13:30 +02:00
tharexde 2b1bfc58f9 added EM4x50 info function 2020-06-15 14:31:43 +02:00
tharexde 79b20a35c1 added EM4x50 info function 2020-06-15 14:31:34 +02:00
tharexde dfe6941a8d added EM4x50 info function 2020-06-15 14:31:27 +02:00
iceman1001 4c2483cd3f helptext 2020-06-14 11:05:43 +02:00
iceman1001 4f50591784 chg; pages is not offset 2020-06-14 10:47:40 +02:00
iceman1001 fef8ef6aa4 chg: fileutils tries to add pack when converting old -> new dump format 2020-06-14 08:17:10 +02:00
iceman1001 aeb8e5beb7 chg, "hf mf eload" - uses same dump printer 2020-06-14 08:16:19 +02:00
Iceman e0eaff453f
Merge pull request #787 from bkerler/DesAuth 
Mifare Des authentification fixes
 2020-06-13 18:26:23 +02:00
Bjoern Kerler e7b2dbd5e8 Remove unnecessary crc 2020-06-13 17:58:47 +02:00
iceman1001 a9bfcb015c style 2020-06-13 17:49:33 +02:00
Bjoern Kerler 9a07c06596 Fix htole32 issue 2020-06-13 17:16:17 +02:00
Bjoern Kerler 0b204f5d1d Merge branch 'DesAuth' of https://github.com/bkerler/proxmark3 into DesAuth 2020-06-13 16:55:45 +02:00
Bjoern Kerler b0d969da24 Fix unsigned vs. signed 2020-06-13 16:55:30 +02:00
Bjoern Kerler 1ca5706c59
Merge pull request #5 from RfidResearchGroup/master 
Update
 2020-06-13 15:12:16 +02:00
Bjoern Kerler 631be7af32 Fixes 2020-06-13 15:11:10 +02:00
Philippe Teuwen 797fa7d01a Tolerate exit-like calls from embedded Python script 
Now sys.exit(0) is silently accepted, while
quit() / raise SystemExit / sys.exit() / sys.exit(n) / exit()
will output sth a warning such as
"Script terminated by SystemExit -1"

Still, don't call os._exit(0), it immediately exits.
 2020-06-13 14:53:47 +02:00
Bjoern Kerler e0bf636aaf Make style 2020-06-13 14:25:40 +02:00
Bjoern Kerler 5adc8e876a Fix DES authentification and format picc 2020-06-13 14:19:21 +02:00
Philippe Teuwen 25fb6df229 Android cross-compilation to client cmake 2020-06-12 23:28:38 +02:00
iceman1001 94403bee59 textual 2020-06-12 22:49:42 +02:00
iceman1001 2bb110fef3 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-06-12 22:35:18 +02:00
iceman1001 9c6ce5be50 chg: "hf mf cwipe" - speed up using backdoor wipe cmd 2020-06-12 22:35:08 +02:00
Philippe Teuwen 020c6882ce colors 2020-06-12 19:52:13 +02:00
Philippe Teuwen 8c5be2678f Yet another color management, settings autodetection done earlier 2020-06-12 19:45:18 +02:00
Philippe Teuwen 30c0345c31 Fix fix colors 2020-06-12 18:21:03 +02:00
Philippe Teuwen bb5c588935 Fix colors detection under Windows (when no ref & when redirected IOs) 2020-06-12 18:17:39 +02:00
Philippe Teuwen ce61b67910 Remove spurious color 2020-06-12 18:01:06 +02:00
iceman1001 20c46d1af5 chg: in order to be able to upgrade fw on smartcard it must be available 2020-06-12 17:49:52 +02:00
iceman1001 60c47a7e7d textual 2020-06-12 17:29:34 +02:00
iceman1001 9ba03aec74 fix: "emv scan" - better fix for filename 2020-06-12 09:44:50 +02:00
iceman1001 cdbe6bc35b fix: "emv scan" - now dont save in execution folder 2020-06-12 09:27:55 +02:00
iceman1001 6dc0aa53c7 textual... 2020-06-11 20:58:31 +02:00
iceman1001 c716bb9e31 textual, color, and "hf iclass info" does something 2020-06-11 20:11:44 +02:00
iceman1001 6a8ea64feb text 2020-06-11 19:53:21 +02:00
iceman1001 fc5feffa4b color 2020-06-11 19:23:15 +02:00
slurdge 5f148bb835 Happy colors for messages coming from pm3 2020-06-11 16:21:27 +02:00
Iceman 291238a2f0
Merge pull request #772 from slurdge/bigbigbuf 
[WIP] Make BigBuf take dynamically the available space with a fixed (4K) stack
 2020-06-11 13:09:20 +02:00
Philippe Teuwen 73b6138f7f cmddata: Adjust bigbuf size on client side as before but fix 1b overflow 2020-06-11 01:18:50 +02:00
Lukas Kuzmiak edff230d55 fix a bug in MADInfoByteDecode (did not return 0x00), textual fixes 2020-06-10 14:59:53 -07:00
slurdge c11c7ab545 Add support for client getting bigbufsize 2020-06-10 23:03:03 +02:00
iceman1001 6f1c074801 textual 2020-06-10 22:47:47 +02:00
Philippe Teuwen 8ccc592ca0 mf ndef examples 03e1 -> e103 2020-06-10 14:02:14 +02:00
iceman1001 d7377e7ccc textual 2020-06-10 13:33:08 +02:00
Philippe Teuwen cb614f3f11 cliparser: generalize ctx usage 2020-06-10 11:34:33 +02:00
iceman1001 cd9b26af17 helptext 2020-06-10 08:44:13 +02:00
iceman1001 cb22004635 chg "hf mf cwipe" - textual and also use magic wipe card 2020-06-10 08:43:29 +02:00
Lukas Kuzmiak 9d71f66d16 Mifare MAD Card Holder Information 2020-06-09 18:34:59 -07:00
Philippe Teuwen b55c186b3a make style 2020-06-10 01:17:49 +02:00
Lukas Kuzmiak ca30ff9bc2 highlight sector line instead of printing it twice, update Changelog 2020-06-09 15:39:17 -07:00
Lukas Kuzmiak 33662bdd59 Decode MAD Info Byte and show info about sector it points to 2020-06-09 14:43:00 -07:00
iceman1001 dcabb7e37d chg: hf 14a info - dont print some hints if magic 2020-06-09 21:29:59 +02:00
Philippe Teuwen def475e747 Add SKIPREADLINE support to make and cmake 
It's mostly for headless support.
At the moment, for interactive uage without readline, some commands will exit the client prematurely if they use kbd_enter_pressed().
 2020-06-09 21:21:15 +02:00
Philippe Teuwen 4372a728f7 mad ndef no swap and restore official AID 0xE103 2020-06-09 21:19:31 +02:00
Philippe Teuwen 92f4c445e4 mfc ndef needs swapped mad according to our default way to treat mad... 2020-06-09 21:07:53 +02:00
Philippe Teuwen 9a15632689 MAD swap again 2020-06-09 20:53:33 +02:00
Philippe Teuwen 35c6ee1bbb rework a bit mfc mad 2020-06-09 20:17:08 +02:00
Philippe Teuwen 33144d1be8 mfc mad get_aid_description: add verbose passthru 2020-06-09 18:46:07 +02:00
Philippe Teuwen 242c276bfb mfc mad_print compare 2020-06-09 18:45:37 +02:00
iceman1001 a93e54374e working case-insense 2020-06-09 17:52:32 +02:00
iceman1001 cb4369f3ec fix: hf mf mad - return value 2020-06-09 17:38:29 +02:00
iceman1001 a71f4cd475 fix coverity resource leak 2020-06-09 17:01:31 +02:00
iceman1001 17f56479ea fix coverity 2020-06-09 16:59:20 +02:00
iceman1001 5ada65bb20 textual 2020-06-09 16:46:46 +02:00
iceman1001 241309291b chg: hf iclass , use fileutils 2020-06-09 16:25:56 +02:00
iceman1001 33965f51d8 minor <> 2020-06-09 16:24:12 +02:00
iceman1001 e9fba19915 fileutils should be searching for json 2020-06-09 16:23:28 +02:00
iceman1001 76791bde0a textual 2020-06-09 16:22:35 +02:00
iceman1001 158251b2d9 look up mad directory json 2020-06-09 16:21:54 +02:00
iceman1001 5b10df9b4c textual 2020-06-09 11:32:19 +02:00
iceman1001 d12606cb26 reverse crc check 2020-06-09 11:14:40 +02:00
Lukas Kuzmiak 3cbad6fa4c Merge remote-tracking branch 'public/master' into mifare-mad-fix 2020-06-09 02:06:27 -07:00
iceman1001 849be2376c textual 2020-06-09 09:19:25 +02:00
iceman1001 a0cbaee138 chg: mad makeover 2020-06-09 08:51:12 +02:00
Lukas Kuzmiak e3d16649b8 MAD application code & cluster code were swapped 2020-06-08 21:22:40 -07:00
iceman1001 86c649f955 chg: "lf viking demod" - prepping for lib 2020-06-08 18:43:34 +02:00
Philippe Teuwen 224cb2ffd7 make style 2020-06-08 03:15:10 +02:00
Philippe Teuwen 15012198f9 client: replace zlib by bzip2 2020-06-08 02:50:43 +02:00
iceman1001 93dbb24103 ftell return signed 2020-06-07 20:46:29 +02:00
iceman1001 d0b22cbd95 coverty 290397, 290399 2020-06-07 20:11:36 +02:00
iceman1001 307e39bb22 exposing function 2020-06-07 19:47:36 +02:00
iceman1001 8dd56a9004 fix resource leak 2020-06-07 19:29:14 +02:00
iceman1001 ae10e76cb5 fix resource leak 2020-06-07 19:25:56 +02:00
iceman1001 c84f81de76 chg: 'sc raw' - print response bytes 2020-06-06 23:32:09 +02:00
iceman1001 5bd300bb59 hint on failed serial port 2020-06-05 14:20:52 +02:00
iceman1001 f354f480de chg; return codes 2020-06-05 11:05:46 +02:00
iceman1001 d2a499ce5e chg: 'trace save' - use .trace extension 2020-06-04 11:52:58 +02:00