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

6797 commits

Author SHA1 Message Date
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
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
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
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
Philippe Teuwen beadecf7eb -p refs - unify param 2020-10-01 00:29:53 +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
iceman1001 b522899190 remover crc, sw codes in output 2020-09-30 10:24:53 +02:00
Iceman ba835b8d03
Merge pull request #983 from mwalker33/cliparser 
cliparser cleanup 2
 2020-09-30 10:13:44 +02:00
iceman1001 df71240a27 fix calypso lua script 2020-09-30 10:10: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
mwalker33 38358e2e2a Update cliparser.c 
Change white to default user color
 2020-09-30 07:28:05 +10:00
mwalker33 45ca5c416d Update cliparser.c 
Adjusted to meet RRG format style and color.
 2020-09-29 20:21:34 +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
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
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 7c6fa54d61 default keys 2020-09-26 14:58:09 +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
iceman1001 8e819f1b26 textual 2020-09-24 22:55:09 +02:00
iceman1001 cabe121ca8 lf help text 2020-09-24 19:51:57 +02:00
iceman1001 ae6d69a337 more default 2020-09-24 19:04:51 +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
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 49b413106f Rename legic scripts 2020-09-23 01:35:27 +02:00
Philippe Teuwen 4c339f61f5 Rename tnp3 scripts 2020-09-23 01:28:28 +02:00
Philippe Teuwen a82dba61fa Rename offline mf conversion scripts 2020-09-23 01:00:05 +02:00
Philippe Teuwen 3909053cee Rename data_readpwdmem.lua -> mem_readpwd.lua and data_readpwdmem-spiffs.lua -> mem_spiffs_readpwd.lua 2020-09-23 00:46:57 +02:00
Philippe Teuwen 9dc2f38ac8 Rename hf_mf_dump-laundromat.lua -> hf_mf_dump-luxeo.lua 2020-09-23 00:40:01 +02:00
Philippe Teuwen 8cda2e3a29 Rename hf_mfc_uidbruteforce.lua -> hf_mf_uidbruteforce.lua 2020-09-23 00:37:38 +02:00
Philippe Teuwen 6946a558e3 Rename hf_mfm_dumpdecrypt.lua -> hf_mf_mini_dumpdecrypt.lua 2020-09-23 00:35:30 +02:00
Philippe Teuwen f286ed9794 Rename hf_lf_multi_bruteforce.lua -> multi_bruteforce.lua 2020-09-23 00:31:28 +02:00
Philippe Teuwen 39a01e023d typo 2020-09-23 00:28:33 +02:00
Philippe Teuwen 8cea2d4c9e mv script 2020-09-23 00:27:16 +02:00
Philippe Teuwen ada9c76f67 Rename iso15_magic.lua into hf_15_magic.lua 2020-09-23 00:23:29 +02:00
Philippe Teuwen fb3f49c2f0 Rename mfc_gen3_writer.lua into hf_mf_gen3_writer.lua 2020-09-23 00:21:42 +02:00