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

7109 commits

Author SHA1 Message Date
iceman1001
64ee9885d0 nack text 2020-03-15 11:51:26 +01:00
iceman1001
945e508e23 new command: hints h - will set hint messages on / off. default mode is OFF. Hint texts makes its easier for beginners but adds text to anyone who knows the pm3 client 2020-03-15 11:51:09 +01:00
iceman1001
6172eccefd chg: hf 14a info - some hint texts added and static nonce text changed. 2020-03-15 11:03:23 +01:00
Daniel Underhay
132bd6c1f7 Add colour to hf 14a and hf mfu commands 2020-03-15 19:57:47 +11:00
iceman1001
f2a287c621 maur keys 2020-03-14 11:04:50 +01:00
Daniel Underhay
875aaee795 Last changes 2020-03-14 01:58:14 +11:00
Daniel Underhay
267063a05c Fix compile errors 2020-03-14 01:52:25 +11:00
Daniel Underhay
3e8c4b2173 Typo 2020-03-14 01:22:22 +11:00
Daniel Underhay
e041e625c0 Colour fixes 2020-03-14 01:17:31 +11:00
Daniel Underhay
266f2f0fc8 Add colour to lf hid commands 2020-03-14 01:09:25 +11:00
iceman1001
bf597dd2d2 cppchecker - signed shift 2020-03-13 14:28:02 +01:00
iceman1001
43e1c5f22d cppchecker - shadow 2020-03-13 14:27:50 +01:00
iceman1001
e460a4e6ca cppchecker - param name 2020-03-13 14:23:34 +01:00
iceman1001
6f20f86c2d cppchecker - param name 2020-03-13 14:22:53 +01:00
iceman1001
656f35036d text 2020-03-13 13:01:23 +01:00
iceman1001
14e0b8e2df text 2020-03-13 11:40:55 +01:00
iceman1001
22e2599ce0 chg: hf mfu info - colors 2020-03-13 10:53:25 +01:00
iceman1001
dfd408db8d cardhelper 2020-03-11 21:00:19 +01:00
iceman1001
5c2d4a0bbd text 2020-03-11 18:38:07 +01:00
iceman1001
b96585483d fix: hf iclass decrypt - making sure we use available bytes even if app limit reports much more data 2020-03-11 17:08:03 +01:00
Daniel Underhay
fa1103bbc3 Add Mifare Ultralight bruteforce support to hf_bruteforce lua script 2020-03-11 18:23:37 +11:00
ikarus
9124b3c988 fix: (static)nested time and keys/sec 
also some wording and consistency
 2020-03-10 21:37:23 +01:00
iceman1001
f805e5c7c7 whitespace 2020-03-10 17:10:05 +01:00
iceman1001
bccad7b9d5 hint message 2020-03-10 17:06:00 +01:00
iceman1001
107b474b8a whitespace 2020-03-10 17:05:45 +01:00
iceman1001
adee34083e whitespace 2020-03-10 17:00:59 +01:00
iceman1001
f6940f1d8e chg: checksum test2 2020-03-10 10:53:02 +01:00
iceman1001
66d3abafb2 chg: checksum test 2020-03-10 10:45:01 +01:00
iceman1001
e749174d79 text 2020-03-10 10:41:16 +01:00
iceman1001
8b1482d72d fix: hf 14a sim x - above 16 sectors.. 2020-03-10 10:26:33 +01:00
iceman1001
c27d84b06c text 2020-03-09 19:00:27 +01:00
iceman1001
c28a71b586 header 2020-03-09 17:07:25 +01:00
iceman1001
111af2bacb Chg: 'lf indala clone' - now can use FC/CN for 26b format. Checksum is still not known. 2020-03-09 16:39:52 +01:00
iceman1001
074f6c374e add: hf mf personlize - Personalize the UID of a Mifare Classic EV1 card (@pwpiwi) see 0b4efbdef2 2020-03-09 11:02:26 +01:00
Marlin Sööse
df6bc7e9f3
Update mfc_default_keys.dic 
add key
 2020-03-06 10:58:18 +08:00
iceman1001
393d998ad9 fix downloading lf config 2020-03-05 11:27:42 +01:00
iceman1001
b6dcfbf078 chg: allow to download ´lf config´ settings to client 2020-03-05 11:16:05 +01:00
Joan Bono
ce88d8b3ae
Update cmdlfparadox.c 2020-03-02 16:02:48 +01:00
iceman1001
61e6ff6991 chg: added hint text for lf clone part2 2020-03-02 14:15:51 +01:00
iceman1001
783d97bd09 Chg: added hint texts to lf clone commands 2020-03-02 13:59:41 +01:00
iceman1001
9205b2d390 text 2020-03-02 11:12:13 +01:00
iceman1001
da21f94b66 fix coverity 267478 2020-03-01 17:15:48 +01:00
iceman1001
8908798efd fix coverity 267218 2020-03-01 16:38:01 +01:00
iceman1001
bf975af358 fix coverty 267216 resource leak 2020-02-29 21:09:16 +01:00
iceman1001
c30bb354ac chg: 'lf hid brute' - now uses UP/DOWN to specify direction only, more verbose and actually exits when done. 2020-02-29 09:27:55 +01:00
Iceman
b9a7215ffa
Merge pull request #581 from mwalker33/Keri-MS 
Keri Internal ID demod alignment. Issue #577
 2020-02-28 09:49:25 +01:00
mwalker33
de65a431cf Update cmdlfkeri.c 2020-02-28 19:28:51 +11:00
capnkrunchy
e14c11e1c8
Fix lf hid brute 2020-02-27 11:26:16 -06:00
iceman1001
2886a99350 add: cryptohelper support 2020-02-27 16:35:17 +01:00
iceman1001
ab7bf0cb2a fix: hf mf autopwn on debian... 2020-02-27 14:26:28 +01:00
iceman1001
2f2443c7fa text 2020-02-24 21:31:58 +01:00
iceman1001
b87b0313da chg: tighter detection of static nonce 2020-02-24 20:39:53 +01:00
iceman1001
17dd4bc572 revert #520 2020-02-24 20:39:32 +01:00
Iceman
fc84a285ff
Merge pull request #573 from h4waii/patch-3 
fix: #520 - free mutex after work is done
 2020-02-24 15:00:17 +01:00
iceman1001
11f50ef7bc chg: textual and remove adjustment for antenna measures 2020-02-24 09:45:56 +01:00
iceman1001
b05042d896 textual 2020-02-24 09:44:48 +01:00
h4waii
d9e073410d
fix: #520 - free mutex after work is done 
Why not just free after key found or not found?
 2020-02-24 00:04:06 +11:00
iceman1001
8b10107c40 fix: #520 - calling init before initialize mutexs is bad 2020-02-23 10:28:51 +01:00
Iceman
bb9c53ae7b
Merge pull request #572 from mwalker33/Keri-MS 
Partial Keri MS
 2020-02-23 10:18:42 +01:00
mwalker33
f2ae1ff57a Update cmdlfkeri.c 2020-02-23 11:21:55 +11:00
iceman1001
7378ea531a hide function xor since it interfers with native xor funtions 2020-02-22 13:18:59 +01:00
iceman1001
004b4ae3c9 textual 2020-02-22 13:17:36 +01:00
iceman1001
e56f14fe4d textual 2020-02-22 13:16:36 +01:00
mwalker33
f32efd10fe Update cmdlfkeri.c 2020-02-21 22:21:56 +11:00
Joe Harrison
7d157606ee Use /usr/bin/env in shebangs 
Stop assuming that bash is in /bin, and that perl and python are in
/usr/bin, etc.
Instead, use env command to find these commands in the path.
 2020-02-18 00:00:24 +00:00
mwalker33
c6ceeed6d5 Update cmdlfkeri.c 2020-02-17 21:49:43 +11:00
mwalker33
d7c3cc8028 Update cmdlfkeri.c 2020-02-16 20:48:53 +11:00
iceman1001
31507be549 textual 2020-02-12 02:26:44 +01:00
iceman1001
f32d94b99c textual 2020-02-12 02:26:05 +01:00
iceman1001
86fdf8e987 color 2020-02-12 02:13:04 +01:00
Kevin-Nakamoto
5262783301 fix filename issue (dump) 2020-02-06 16:49:26 -05:00
Kevin-Nakamoto
7116895654 added hf lto restore and fix filename for dump 2020-02-06 13:38:58 -05:00
Jan Neduchal
7e57bc4ed1 Fixed the url as the service has moved 2020-02-05 16:32:21 +01:00
iceman1001
3e3dc83789 filter ansi 2020-02-04 17:39:59 +01:00
iceman1001
189523b190 textual layout in printing formats 2020-02-04 17:38:47 +01:00
iceman1001
aa0054e6b9 chg: trying to decode block 7 when decrypted.. 2020-02-04 00:41:57 +01:00
iceman1001
e2d2e86df6 textual 2020-02-03 20:53:50 +01:00
Philippe Teuwen
b8a46a6fe3 fix typo, thanks @neduchaljan! 2020-02-01 18:23:16 +01:00
Michael Farrell
75841e7b20 fix: logic inversion in loadFileDICTIONARY_safe use of CheckStringIsHEXValue 2020-01-30 21:00:22 +11:00
iceman1001
01560dda81 textual 2020-01-30 09:20:10 +01:00
Kevin-Nakamoto
d5b21cbdd9 added hf lto dump 2020-01-29 13:38:24 -05:00
iceman1001
996b41dce7 chg: write serial port in window title (plot/slider) 2020-01-29 15:16:50 +01:00
iceman1001
aae8f6aebf prepare for LTO dump 2020-01-28 08:28:36 +01:00
Iceman
5817cf1a79
Merge pull request #539 from Kevin-Nakamoto/lto-write 
added write block command for LTO-CM
 2020-01-27 21:23:04 +01:00
Kevin-Nakamoto
88a976d9ff added write block command for LTO-CM 2020-01-27 14:39:38 -05:00
iceman1001
28c6a5dc2d textual 2020-01-25 14:29:35 +01:00
iceman1001
6ddf9823e9 textual 2020-01-24 18:21:57 +01:00
iceman1001
6ad7f1ecf7 textual 2020-01-24 16:28:39 +01:00
iceman1001
ef8cdc8bab textual 2020-01-24 14:48:30 +01:00
Kevin-Nakamoto
66803e442d Support LTO-CM read block and add CM-type into hf lto info command. 2020-01-22 13:55:37 -05:00
iceman1001
fc1cede778 fix: #536 2020-01-22 18:43:20 +01:00
Iceman
c3ba6bad3d
Merge pull request #534 from RfidResearchGroup/hitag 
fix #533
 2020-01-22 17:38:49 +01:00
iceman1001
e5fbfef59b fix #533 2020-01-22 17:38:05 +01:00
Iceman
53927b6a5c
Merge pull request #532 from RfidResearchGroup/hitag 
Hitag
 2020-01-22 13:21:19 +01:00
iceman1001
3fe4582e28 chg: hitag dump should be in its own command 2020-01-22 13:13:45 +01:00
iceman1001
f4b3488a09 chg: 'hf mf static' - now uses file on spiffs for key transfers. speedup on RDV4 2020-01-22 13:11:20 +01:00
Iceman
8835f6678c
Merge pull request #531 from RfidResearchGroup/hitag 
Hitag
 2020-01-22 13:06:18 +01:00
Iceman
03bae8f9b8
Merge pull request #530 from 7homasSutter/master 
Fix FeliCa Light Dump
 2020-01-21 18:50:01 +01:00
Thomas Sutter
35131a52c9 Fix FeliCa Light Dump function 2020-01-21 18:07:18 +01:00
iceman1001
5a33dca1a3 chg: spiffs load - broke out load 2020-01-21 15:25:40 +01:00
iceman1001
15b4b198b0 chg: 'lf search' - now always check for HITAG 2020-01-21 15:22:36 +01:00
Iceman
06e7777deb
Update mfu_magic.lua 
wrong define used.
 2020-01-21 14:56:22 +01:00
iceman1001
e3ff3a8819 textual 2020-01-20 11:54:21 +01:00
iceman1001
3fa5858af9 textual 2020-01-20 11:47:13 +01:00
iceman1001
e85fabf015 chg: 'lf hitag list' - improved hitag annotation 2020-01-20 11:37:10 +01:00
iceman1001
dab043a1fc textual 2020-01-19 14:51:39 +01:00
iceman1001
f8c7942082 textual 2020-01-19 12:09:56 +01:00
iceman1001
505777e3f1 text 2020-01-17 17:54:17 +01:00
iceman1001
42c6c1338e textual 2020-01-17 17:41:28 +01:00
iceman1001
7ef3da91a0 chg: 'hf search' - textoutput logic 2020-01-17 17:37:08 +01:00
iceman1001
d451631b13 use DEFINES 2020-01-17 14:25:07 +01:00
iceman1001
655345e109 Chg 'lf hitag info' - use DEFINES 2020-01-17 14:05:11 +01:00
iceman1001
864256269b textual 2020-01-17 14:04:30 +01:00
iceman1001
69bb285524 fix: 'hf lto info' - now correctly selects and prints LTO-CM uid. 2020-01-17 13:44:41 +01:00
Philippe Teuwen
78a6aa389b Merge branch 'master' into hitag 
* master:
  style
 2020-01-15 19:25:39 +01:00
Philippe Teuwen
7c33eeb7d5 style 2020-01-15 19:25:29 +01:00
Philippe Teuwen
cfc76098c5 Merge branch 'master' into hitag 
* master:
  Fix delay in acquisition and DoAcquisition_config usage. Fixes #524
  chg: 'data samples' - colors
  only set new timeout if its faster :)
 2020-01-15 16:28:27 +01:00
iceman1001
2de3a756cc chg: 'data samples' - colors 2020-01-15 13:07:51 +01:00
iceman1001
89bae75c55 hitag signal refactoring 2020-01-14 22:08:43 +01:00
iceman1001
d956e8c2a3 textual 2020-01-14 21:17:56 +01:00
iceman1001
e5a1861552 textual 2020-01-14 21:17:35 +01:00
iceman1001
b299a31ad7 Added: 'lf nextwatch sim' - use rawhex to simulate 2020-01-14 19:44:29 +01:00
iceman1001
32fdde3d00 fix: 'lf indala read' - adapted the long id detection to be less picky 2020-01-14 17:22:59 +01:00
iceman1001
b37a4c14eb Add 'hf mf staticnonce' - a nested find all key solution command for tags that has a static nonce. \n See https://github.com/RfidResearchGroup/proxmark3/issues/133 \n See https://github.com/Proxmark/proxmark3/issues/899 \n This solution is based upon the ideas and solutions of @uzlonewolf and @xtigmh . Thanks! 2020-01-14 16:00:31 +01:00
h4waii
81c7c7316d
Update mfc_default_keys.dic 
Added various keys from hotel cards found through hardnested attacks
 2020-01-14 17:21:49 +13:00
Philippe Teuwen
f46a01abfa Move snd_info struct to top of file 2020-01-13 14:04:43 +01:00
Philippe Teuwen
5cdc6aab48 Remove libsndfile dep and code our own savewav 2020-01-13 13:49:32 +01:00
iceman1001
d78b308470 bug: keytable printing 2020-01-12 18:15:25 +01:00
iceman1001
6fa188062c style 2020-01-12 17:30:29 +01:00
iceman1001
ed67936892 style 2020-01-12 17:28:12 +01:00
iceman1001
b4e0701f27 Chg: 'hf plow' - remove signal offset 2020-01-12 17:13:02 +01:00
iceman1001
6e3dde9d76 add 'hf plot' - from offical repo (piwi) 2020-01-12 16:45:24 +01:00
Nick
a88ec7c58a
Correct usage for 'hf mf csave' 
Corrected csave usage to show `o` flag for output file instead of `i`.
 2020-01-10 15:00:50 +00:00
iceman1001
07dfe8493c lf read no verbose 2020-01-09 22:58:49 +01:00
iceman1001
30e50cf407 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-01-09 20:08:40 +01:00
iceman1001
3e7f687e48 not verbose 2020-01-09 20:02:01 +01:00
iceman1001
0869cbc6ad Fix: 'lf config' - calling without param messes up all device settings. 2020-01-09 19:28:44 +01:00
iceman1001
1d6ef96d12 Chg: fixes from original repo 2020-01-09 19:26:12 +01:00
iceman1001
76fa7efe72 Chg: 'lf indala clone' - new param '-c' for encode heden2l format and param '--Q5' to write to t5555 cards 2020-01-09 19:25:34 +01:00
iceman1001
68eb66052a cliparser updates 2020-01-09 14:26:52 +01:00
iceman1001
413af36dcc Chg: 'lf indala demod' - added Heden-2L descramble\n ref: http://www.proxmark.org/forum/viewtopic.php?pid=37833#p37833 2020-01-09 11:45:53 +01:00
hamperfait
5799ca38e1
Update mfc_default_keys.dic 
Added Granada, ES transport Card keys
 2020-01-09 08:00:58 +01:00
iceman1001
68e41492ad style 2020-01-07 22:19:28 +01:00
iceman1001
2a0d1557e1 style 2020-01-07 22:18:27 +01:00
iceman1001
47eab16881 style 2020-01-07 22:14:01 +01:00
iceman1001
2bfbcb20ac Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-01-07 22:05:56 +01:00
iceman1001
f7156e7485 chg: adapted lfsampling, and swapped from 'silent' logic to the more natural 'verbose' logic 2020-01-07 22:05:01 +01:00
iceman1001
e9960ed0a0 Fix: lf io sim/clone - now takes same input format (decimal/hex) as outputted 2020-01-07 09:19:59 +01:00
danshuk
2cac27ed53 chg: lf pac sim *wip* 2020-01-06 19:38:44 +00:00
iceman1001
80e1af774d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-01-05 23:15:35 +01:00
iceman1001
a1d93567d2 shadowing 2020-01-05 23:14:24 +01:00
iceman1001
30de7f5082 shadow 2020-01-05 23:07:33 +01:00
iceman1001
42ed891f30 shadowing 2020-01-05 22:55:10 +01:00
iceman1001
b3b1e10330 shadowing 2020-01-05 22:54:31 +01:00
iceman1001
719fcf91ab strdup name confusing 2020-01-05 22:24:24 +01:00
iceman1001
eb4573b06c strdup 2020-01-05 21:45:29 +01:00
iceman1001
731f6fc322 textual 2020-01-04 20:21:10 +01:00
iceman1001
990cd3590a add: lf pac sim *wip* 2020-01-04 20:01:33 +01:00
iceman1001
eb2130af4b chg: swapped banner placement\nchg: console -c prompt got [con]. 2020-01-04 19:59:36 +01:00
iceman1001
eec1a93b41 fix appveyor 2020-01-04 18:47:52 +01:00
iceman1001
e612ae3de4 chg: adapting luascript to use new filename template for key files. 2020-01-04 16:57:15 +01:00
iceman1001
3b792f8b04 safer string copy 2020-01-04 16:29:17 +01:00
iceman1001
4da12a6089 style 2020-01-04 16:25:38 +01:00
iceman1001
6905cfd548 style 2020-01-04 16:25:31 +01:00
iceman1001
d39b113b40 cppcheck 2020-01-04 16:07:57 +01:00
iceman1001
da6360d123 coverty 263987 2020-01-04 15:53:09 +01:00
iceman1001
a0b6061b86 coverty 2020-01-03 19:22:04 +01:00
iceman1001
0684060ec0 coverty 226411 2020-01-03 19:16:13 +01:00
iceman1001
6f9b9335a1 coverty 226291 2020-01-03 19:13:35 +01:00
iceman1001
4523350471 coverty 265064, 226284 2020-01-03 19:07:00 +01:00
iceman1001
a20895943e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-01-03 19:00:12 +01:00
iceman1001
15597c6c38 cppcheck 2020-01-03 18:59:41 +01:00
Oleg Moiseenko
012d5ef5d5
Merge pull request #510 from merlokk/cur_tlv 
fix `shadow variable` thanks @iceman1001 )
 2020-01-03 20:50:35 +03:00
merlokk
5f1ef5f590 fix shadow variable thanks @iceman1001 ) 2020-01-03 19:50:27 +02:00
iceman1001
12885d6726 covery 263986 2020-01-03 18:41:53 +01:00
iceman1001
c2e3f8c7d5 covery 265061 2020-01-03 18:19:42 +01:00
iceman1001
217c8d043c covery 265061 2020-01-03 18:18:37 +01:00
iceman1001
30c45c4741 covery 265057 - fseek 2020-01-03 18:13:05 +01:00
iceman1001
b7e8ee86a0 covery 265060 resource leak 2020-01-03 18:08:42 +01:00
iceman1001
21de7a265b covery 265055, 265056, 265059 resource leak 2020-01-03 18:07:31 +01:00
iceman1001
9020df5b30 covery 2020-01-03 17:57:45 +01:00
iceman1001
c1f9e076a8 covery 2020-01-03 17:53:03 +01:00
iceman1001
78aae857ac covery 263985 2020-01-03 17:46:50 +01:00
iceman1001
e1503a255b covery 263989 2020-01-03 17:40:03 +01:00
iceman1001
ac8e74c1d9 cppcheck 2020-01-02 19:52:23 +01:00
iceman1001
0fcd79617d cppcheck 2020-01-02 16:17:46 +01:00
iceman1001
1f9ec97dfd cppcheck 2020-01-02 16:12:19 +01:00
iceman1001
1abcae291c cppcheck 2020-01-02 16:07:35 +01:00
iceman1001
01f215a924 Chg: hooked up generator 2020-01-02 15:29:15 +01:00
iceman1001
4eb5907637 cppcheck 2020-01-01 21:32:41 +01:00
iceman1001
fea3185922 cppcheck 2020-01-01 21:28:02 +01:00
iceman1001
866df86825 cppcheck 2020-01-01 21:22:01 +01:00
iceman1001
e50c2f00cc cppcheck 2020-01-01 21:19:59 +01:00
iceman1001
796fdb9085 style 2020-01-01 20:46:26 +01:00
danshuk
a290d18918 cmdlfpac - add decode / encode card ID 2020-01-01 00:12:09 +00:00
osboxes.org
c87e8faefc style 2019-12-31 22:32:54 +01:00
osboxes.org
aa33f8cc2f style 2019-12-31 22:32:12 +01:00
osboxes.org
1aefc4e056 style 2019-12-31 22:19:03 +01:00
osboxes.org
e7056a035d style 2019-12-31 21:42:53 +01:00
osboxes.org
795cc1bc62 style 2019-12-31 21:41:36 +01:00
osboxes.org
bd38d68bd4 style 2019-12-31 21:40:27 +01:00
osboxes.org
855aee04dd style 2019-12-31 21:40:12 +01:00
osboxes.org
1ec7bd1388 style 2019-12-31 21:39:55 +01:00
osboxes.org
bd1244287f style 2019-12-31 21:39:37 +01:00
osboxes.org
48eeceae58 style 2019-12-31 21:38:45 +01:00
osboxes.org
56673c29d3 style 2019-12-31 21:38:13 +01:00
osboxes.org
cabbed8b91 style 2019-12-31 21:37:57 +01:00
iceman1001
d748b2c8ab textual 2019-12-31 15:29:46 +01:00
iceman1001
025c98fc53 cppcheck 2019-12-30 21:47:18 +01:00
iceman1001
155444440e cppcheck 2019-12-30 21:45:18 +01:00
iceman1001
5de1178466 cppcheck 2019-12-30 21:44:42 +01:00
iceman1001
7a867cadcd cppcheck 2019-12-30 21:43:34 +01:00
iceman1001
2137e2b6c8 cppcheck 2019-12-30 21:43:03 +01:00
iceman1001
c193eef326 cppcheck 2019-12-30 21:42:27 +01:00
iceman1001
f428b016c1 cppcheck 2019-12-30 21:11:18 +01:00
iceman1001
c857cf49f3 fix: cppcheck negative compare w u32 2019-12-30 16:50:53 +01:00
iceman1001
a3ce88eaec fix: cppcheck, bool vs & 2019-12-30 16:46:13 +01:00
iceman1001
88237e60c1 cppcheck 2019-12-30 16:41:13 +01:00
iceman1001
fb0eb35710 style 2019-12-30 16:27:51 +01:00
iceman1001
9c8abd2091 chg: refactor printkeytable\n fix: potential crete key null bug\nHelpt text changes 2019-12-29 12:03:06 +01:00
iceman1001
f8876bf748 fix: hf mf nested - now print correct blockno/keytype. Unified output to autopwn style 2019-12-29 12:00:39 +01:00
iceman1001
072255d04f fix: 'hf mf chk' - reading block B ... https://github.com/RfidResearchGroup/proxmark3/issues/489 2019-12-28 23:51:17 +01:00
iceman1001
ac6afe9c04 Chg: 'lf t55xx dump - updated json format 2019-12-28 21:40:52 +01:00
iceman1001
83e8eeb1f8 Chg: 'lf t55xx dump' - now saves as JSON format aswell 2019-12-26 00:23:01 +01:00
iceman1001
03495f0b14 style 2019-12-26 00:22:21 +01:00
iceman1001
c2006e3808 add: mfu_magic.lua - script to talk with your Magic NTAG tag. 2019-12-26 00:09:44 +01:00
iceman1001
c70ab5f5d4 fix: hf mf chk / hf mf fchk / hf mf autopwn - Now correctly writes 0xFF's instead of zeros for unknown keys in binary key file.\nChg: hf mf nested - check for static/fixed nonce added 2019-12-25 14:01:37 +01:00
iceman1001
e701022257 fix: hf search - iClass wrong return code check 2019-12-24 11:30:07 +01:00
iceman1001
648c6a6adc style 2019-12-24 09:52:27 +01:00
iceman1001
7bb5f51340 style 2019-12-24 09:52:11 +01:00
iceman1001
aeb3f74c10 Add: 'hf lto list' - annotation for LTO-CM 2019-12-24 00:57:15 +01:00
iceman1001
db32e20554 spaces 2019-12-23 22:24:45 +01:00
iceman1001
15cafbe6c2 fix: hw search for lto 2019-12-23 22:24:11 +01:00
iceman1001
ed3e0895b5 hook it up 2019-12-23 22:00:34 +01:00
iceman1001
a6a48f0e6d Chg 'hf 14a info' - static/fixed nonce detection 2019-12-23 15:23:04 +01:00
iceman1001
07b3b6ed4e textual 2019-12-23 10:42:42 +01:00
iceman1001
9a68c52438 inline some compare 2019-12-23 10:41:54 +01:00
iceman1001
66426cee1e chg: - adapt to new data save parameter 2019-12-22 12:56:51 +01:00
iceman1001
ea5680dba8 style 2019-12-22 12:51:40 +01:00
iceman1001
a4407ae9f1 add: saving as wave format for LF traces, thanks (@anon)\n chg: 'data save f <filename> w - reword the params to command 2019-12-22 11:19:06 +01:00
iceman1001
286333ca91 add: hf lto info - skeleton to add LTO-CM (Cartridge memort) to PM3 2019-12-22 11:16:59 +01:00
iceman1001
337a1d1dca more 2019-12-21 18:17:03 +01:00
iceman1001
3ddf7a0ce5 iso15 - add some annotation for write mulit 2019-12-20 11:23:27 +01:00
iceman1001
85170f914e b0 doesnt use crc 2019-12-20 11:19:58 +01:00
iceman1001
25b2a8b06b nice output 2019-12-19 22:51:41 +01:00
iceman1001
818de78a1c fix wrong vars name 2019-12-19 22:34:07 +01:00
iceman1001
46783e519a removing some crc 2019-12-19 22:32:00 +01:00
iceman1001
cbff5bcace fixng the read command 0-31bytes 2019-12-19 22:24:03 +01:00
iceman1001
72d51a7774 more fixes 2019-12-19 22:11:35 +01:00
iceman1001
d3723c2649 lto_dump - added 14a connect, no_select options 2019-12-19 21:59:45 +01:00
iceman1001
39b7658528 lto_dump fixes - wrong if-statement, wrong argument for 7bit 2019-12-19 21:03:07 +01:00
iceman1001
0cb57915a1 lto-cm lua script by @kevin. reworked to be more flexble. wip. 2019-12-18 10:14:35 +01:00
iceman1001
08f411de65 textual 2019-12-18 10:13:41 +01:00
iceman1001
b6db3bb43a ?Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-12-17 13:38:08 +01:00
Thomas Sutter
93243f89d9 Fix swapping. Make Style. 2019-12-17 13:18:00 +01:00
Thomas Sutter
040255cdc6 Make style. 2019-12-17 13:10:06 +01:00
Thomas Sutter
bb53a40adb Add auth1 output - experimental. 
Add auth2 command - experimental.
 2019-12-17 13:09:14 +01:00
Thomas Sutter
a65cfc5f4b Fix auth1 response. 2019-12-17 08:19:42 +01:00
Thomas Sutter
47a416a3ac Fix key length in auth1 command. 2019-12-16 14:08:30 +01:00
iceman1001
6a21c780fa chg: lf gallagher demod - using the research from Matt, @megabug, to get better support. WIP. 2019-12-16 13:51:10 +01:00
Thomas Sutter
d1906aa03e Change logs to info. Make style. 2019-12-16 11:25:15 +01:00
Thomas Sutter
8ce30f54d2 Merge remote-tracking branch 'upstream/master' into felica_support_authV1 
# Conflicts:
#	client/cmdhffelica.c
 2019-12-16 11:20:48 +01:00
Thomas Sutter
3f3366429f Add Auth1 Command (Alpha). Untested. 2019-12-16 11:06:48 +01:00
iceman1001
8e45e0e56b textual 2019-12-14 12:57:25 +01:00
iceman1001
f4427b05b2 hf seach - textual 2019-12-14 12:56:19 +01:00
iceman1001
bd70689de2 hf mf nested: break bad loop if timeout (@uzlonewolf) 2019-12-14 12:45:07 +01:00
iceman1001
64d08de6a6 textual 2019-12-11 15:56:36 +01:00
iceman1001
75a5b2efb3 textual 2019-12-10 18:30:18 +01:00
iceman1001
9f47a0a8f4 textual 2019-12-10 18:26:22 +01:00
iceman1001
24d3bf5d9d textual 2019-12-10 18:26:09 +01:00
iceman1001
a66944f7e7 newline 2019-12-10 18:15:51 +01:00
iceman1001
3dd380e985 newline 2019-12-10 18:13:21 +01:00
iceman1001
b748a7989e nexwatch textual, wrong endianess 2019-12-08 18:49:26 +01:00
merlokk
8425de08fd textual 2019-12-06 17:21:45 +02:00
merlokk
45926261db style 2019-12-06 17:12:29 +02:00
merlokk
326e6aa9f2 added hf mf cwipe 2019-12-06 17:04:22 +02:00
iceman1001
5773919f58 textual 2019-12-06 08:51:24 +01:00
iceman1001
3d366d50ef style 2019-12-03 14:53:08 +01:00
iceman1001
3d4a63f46a style 2019-12-03 14:52:34 +01:00
iceman1001
9782f447eb style 2019-12-03 14:52:17 +01:00
iceman1001
b5be8a3663 style 2019-12-03 14:51:55 +01:00
iceman1001
85ff07caa6 chg: return codes etc 2019-12-02 11:53:50 +01:00
iceman1001
e812726c70 chg: return codes etc 2019-12-02 11:47:43 +01:00
iceman1001
535298820b chg: return codes etc 2019-12-02 11:40:22 +01:00
iceman1001
56c4343081 chg: hf 15 csetuid - verify uid is the same after writting 2019-12-02 10:21:32 +01:00
iceman1001
a0f0345169 fix travis 2019-12-02 10:20:07 +01:00
Iceman
3b01177e5f
Merge pull request #484 from merlokk/mfp_check 
hf mfp check
 2019-12-02 09:58:55 +01:00
merlokk
8132de9b4f fix braces 2019-12-01 23:43:47 +02:00
merlokk
256782402e fix linux make errors 2019-12-01 23:39:41 +02:00
merlokk
bc27b0e910 add some help 2019-12-01 23:36:34 +02:00
merlokk
2dfbe151b9 hf mfp check: dictionary works, verbose mode works 2019-12-01 23:21:00 +02:00
merlokk
94eb741a4f refactoring + make dictionary works 2019-12-01 22:33:50 +02:00
iceman1001
fef245be26 textual 2019-12-01 11:32:49 +01:00
merlokk
131730e7db fix docstrings 2019-12-01 11:01:56 +02:00
merlokk
ca462424d0 refactoring 2019-12-01 10:56:41 +02:00
merlokk
1daf155b9c added dictionary 2019-12-01 10:45:02 +02:00
merlokk
e88f4e4cd8 added hex_to_bytes 2019-12-01 01:22:05 +02:00
merlokk
a6a16cfd0c add dictionary search check hex 2019-12-01 00:36:28 +02:00
merlokk
de52ebc3d5 1dd 16 byte key for dictionaries 2019-12-01 00:30:35 +02:00
merlokk
0cb7637e1f added save keys to json for mfp check 2019-11-30 23:46:37 +02:00
merlokk
34e38c9dc5 added json save mfp 2019-11-30 23:45:51 +02:00
iceman1001
5fa2eb9db8 textual 2019-11-30 22:25:53 +01:00
iceman1001
1a052b2607 textual 2019-11-30 20:15:50 +01:00
iceman1001
6166849382 textual 2019-11-30 20:04:37 +01:00
iceman1001
bd80fa254e textual 2019-11-30 20:02:02 +01:00
iceman1001
3ad7c0d319 textual 2019-11-30 19:57:29 +01:00
iceman1001
b8a339361b textual 2019-11-30 17:06:03 +01:00
merlokk
8e6f08835d added some error handling 2019-11-29 17:34:54 +02:00
merlokk
a861d2971c specify key in the command line 2019-11-29 17:29:36 +02:00
merlokk
1efc731fac refactoring and break operation via keyboard 2019-11-29 17:23:30 +02:00
merlokk
385a747dbd added search 2-byte pattern 2019-11-28 16:24:39 +02:00
merlokk
9f8a8cce96 refactoring. move key list to uint8_t[16] array 2019-11-28 15:36:52 +02:00
merlokk
2c101ebbb9 internal keys search works 2019-11-28 15:16:11 +02:00
merlokk
133d59e483 added command parsing and result printing 2019-11-28 14:16:53 +02:00
merlokk
17a2379ddd hf mfp check sketch 2019-11-28 00:49:12 +02:00
merlokk
8cb28a21c6 add mfp default keys 2019-11-28 00:48:39 +02:00
Iceman
48218687d7
Merge pull request #481 from grspy/master 
Add ISO15693 write AFI/DSFID commands and NXP Sysinfo for Slix2
 2019-11-27 21:11:03 +01:00
unknown
ecaf919365 Hf15FindAfi WaitForResponse loop 2019-11-27 21:14:31 +02:00
unknown
931d115ef8 HF15FindAfi now uses reply_ng and added LeaveFieldOn option for HF15Raw 2019-11-27 15:11:43 +02:00
unknown
cef28ad241 HF15 cmds return codes and dropfield where needed 2019-11-26 22:11:02 +02:00
unknown
16e4cf9679 Add ISO15693 write AFI/DSFID commands and NXP Sysinfo for Slix2 2019-11-25 20:53:06 +02:00
iceman1001
13c16e9af7 return codes 2019-11-24 21:14:27 +01:00
iceman1001
ef19979c34 chg: hf 14b write - adding colors 2019-11-24 19:27:08 +01:00
unknown
1b6566cd5c Added support for some ISO15693 custom NXP commands 2019-11-22 13:55:09 +02:00
iceman1001
41e0bf9a50 chg: odl flexpass code removed 2019-11-19 12:17:08 +01:00
iceman1001
3a7a6cce38 chg: hf thin info - honor verbose 2019-11-19 12:14:58 +01:00
iceman1001
290c6f6c31 chg: hf 14a sim x - device simulation loop exited when client exits 2019-11-19 12:01:04 +01:00
Denis Bodor
d8a26e2b8b switch from lua CRC16/ARC to CRC RevEng 2019-11-19 10:55:17 +01:00
Denis Bodor
dec0b0202a Add Luxeo dump script 2019-11-17 12:58:30 +01:00
iceman1001
93c9dc571f chg t55 timings to match offical repo when compiling for PM3OTHER 2019-11-12 19:27:34 +01:00
iceman1001
24638a832d more keys 2019-11-11 16:42:25 +01:00
bogiton
a0168441d8
Update read_pwd_mem_spiffs.lua 2019-11-08 17:46:15 +00:00
bogiton
11b0a69869
Update read_pwd_mem.lua 2019-11-08 17:44:52 +00:00
iceman1001
2c0a8bbd91 make style 2019-11-08 12:01:46 +01:00
iceman1001
182f239d21 make style 2019-11-08 12:00:21 +01:00
iceman1001
5cca8616cb Add: 'hf mfu otptear' - draft of @fukmar implementation for a tear-off attack against OTP block on Mifare Ultralight based card. 2019-11-08 10:28:29 +01:00
iceman1001
a0204386f0 chg: new samples has less similar preamble 2019-11-07 07:23:13 +01:00
Philippe Teuwen
ad475a224e hf mf wrbl: don't give as example how to write a block0 with faulty BCC, remove mfc stuff in df 2019-11-05 23:15:01 +01:00
iceman1001
50bf809a4b textual 2019-11-05 20:04:29 +01:00
merlokk
7ea2c0753c aidlist 2019-11-05 16:01:05 +02:00
iceman1001
aabf3ecafa removed problematic code. Attribution to @jamchamb for his amii lua scripts 2019-11-05 10:51:27 +01:00
iceman1001
485eccd670 textual 2019-11-05 10:44:55 +01:00
Oleg Moiseenko
7b650e98a0
Merge pull request #465 from merlokk/hf_info_aid_search 
Hf info aid search
 2019-11-05 02:07:02 +03:00
merlokk
12cae27862 select result tlv decode and some diags print 2019-11-05 00:40:58 +02:00
merlokk
8befad6d34 hf 14a info: added verbose, command optimization, move it to cliparser 2019-11-05 00:06:51 +02:00
Philippe Teuwen
8cff4a24bb
Merge pull request #452 from Fl0-0/fix-for-#450 
Fix for hf mf autopwn #db# AcquireNonces: Auth1 error loop, revert co…
 2019-11-04 22:29:08 +01:00
merlokk
6eb7c8e7a5 fixed aid selection 2019-11-04 23:21:02 +02:00
merlokk
2a4a9745c9 aid search works 2019-11-04 21:18:37 +02:00
merlokk
766262033a some text improvements 2019-11-04 20:20:42 +02:00
merlokk
0b5cc59bcd aidsearch works 2019-11-04 20:15:09 +02:00
merlokk
c861f68a87 fix aidlist 2019-11-04 20:14:43 +02:00
merlokk
b07e33bcdb changed signature of hf info 2019-11-04 19:54:51 +02:00
merlokk
d14644c09f add aidsearch sketch 2019-11-04 19:54:23 +02:00
merlokk
706d8cc332 fix aidlist 2019-11-04 19:53:53 +02:00
Philippe Teuwen
59730ee4fd mfc keys dict: -☻ 2019-11-04 18:31:44 +01:00
merlokk
032019763e add tesla https://gist.github.com/darconeous/2cd2de11148e3a75685940158bddf933 2019-11-04 18:08:46 +02:00
merlokk
0980e619bf updated aid list 2019-11-04 18:03:23 +02:00
iceman1001
68ac8dd979 fix: cotag use NG 2019-11-04 15:42:28 +01:00
Iceman
44d3539cbf
Merge pull request #463 from 7homasSutter/felica_support_fix_raw 
Felica support: Add new commands
 2019-11-04 12:12:25 +01:00
Thomas Sutter
601b8d281a Add command request system code. 
Add command request specification version.
Add command reset mode.
Make Style.
 2019-11-04 10:24:29 +01:00
bogiton
7a79901ed0
Add read_pwd_mem_spiffs.lua 2019-11-02 18:08:59 +00:00
bogiton
22b7d54362
Add GetFromFlashMemSpiffs in scripting.c 2019-11-02 18:07:36 +00:00
iceman1001
06076708a7 chg: less stack pressure. And now also free:ing 2019-11-02 17:59:06 +01:00
Iceman
cd9ff9e61c
Merge pull request #459 from 7homasSutter/felica_support_sniffing 
Felica support sniffing
 2019-11-02 17:36:00 +01:00
iceman1001
025234ba2b yes 2019-11-02 17:29:20 +01:00
Thomas Sutter
c76c59a35c Fix segmentation fault in cmd. 2019-11-02 13:29:38 +01:00
Thomas Sutter
42fd13985f Make style. 2019-11-01 15:19:09 +01:00
Thomas Sutter
b422b79679 Merge remote-tracking branch 'upstream/master' into felica_support_sniffing 2019-11-01 15:12:24 +01:00
Thomas Sutter
dadad1dacf Fix felica sniffing. 2019-11-01 15:06:48 +01:00
iceman1001
b383b16ded chg: lf fdx clone/sim - added extended data 2019-10-31 08:39:11 +01:00
iceman1001
eb7fd5f8ab textual 2019-10-30 15:45:52 +01:00
iceman1001
01b149efa5 fix: fdx crc calc 2019-10-30 15:44:57 +01:00
Thomas Sutter
9738834faf Remove unused function. 2019-10-30 13:43:23 +01:00
Thomas Sutter
f3d79c22f2 Remove parity bit check for felica. 2019-10-30 13:42:52 +01:00
Thomas Sutter
1a852e02c7 Fix sniffing command. 
Refactor hf list felica.
 2019-10-30 13:35:03 +01:00
iceman1001
417679c3d8 more keys 2019-10-30 11:16:53 +01:00
iceman1001
c6f4bf2aa6 return codes 2019-10-29 19:32:27 +01:00
Thomas Sutter
76215fffc6 Refactor sniffing command. 2019-10-29 15:39:54 +01:00
Thomas Sutter
eba19c0bd6 Make style. 2019-10-29 13:35:09 +01:00
Thomas Sutter
83c629cbec Fix parameter i parsing bug. 2019-10-29 12:52:45 +01:00
Thomas Sutter
2e60cb4fa6 Add write without encryption command. 2019-10-29 11:14:38 +01:00
Thomas Sutter
498c4b8377 Refactor FeliCa structs. 2019-10-29 10:22:47 +01:00
Thomas Sutter
06f3f1b637 Remove code duplication. 2019-10-29 10:00:47 +01:00
Thomas Sutter
271a8ce548 Add additional check for xero byte response. 
Add wrunencrypted usage text.
 2019-10-29 09:44:38 +01:00
Philippe Teuwen
900184b600 ikeys: "declaration shadows a variable in the global scope" warning 2019-10-26 20:37:55 +02:00
Philippe Teuwen
6c048c5026 comms.c dl_it: remove unused arg 2019-10-26 19:49:46 +02:00
Philippe Teuwen
cc902fb4d8 ui.c: warnings discarded qualifiers 2019-10-26 19:40:59 +02:00
Philippe Teuwen
11b954b6bd proxmark.c: warnings discarded qualifiers 2019-10-26 19:40:32 +02:00
Philippe Teuwen
129b1c4b1f make sure all .c include their own .h 2019-10-26 18:56:36 +02:00
Philippe Teuwen
af75c70c27 wiegand: no previous prototype warnings 2019-10-26 18:49:25 +02:00
mwalker33
9c2ef4e0da 2nd Win10 Color Reg. Key Check 2019-10-26 13:17:33 +11:00
Fl0-0
6f3f5d2d83
Fix for hf mf autopwn #db# AcquireNonces: Auth1 error loop, revert commit abb011c 2019-10-25 14:53:08 +02:00
Philippe Teuwen
07cf3fd32b fix few missing declarations -> static or add include file 2019-10-25 00:55:16 +02:00
Philippe Teuwen
390d0ab525 lf tune: allow float, added parse_getfloat to utils 2019-10-25 00:53:56 +02:00
Philippe Teuwen
eb7268cd98 lf: change macros to allow float freq, change 134 -> 134.2 2019-10-25 00:42:47 +02:00
Philippe Teuwen
cb06bea448
Merge pull request #451 from 7homasSutter/felica_support_read_without_encryption 
Felica support: add commands request response and read without encryption
 2019-10-24 21:33:27 +02:00
Thomas Sutter
12cd208253 Make style. Format help text. 2019-10-24 17:07:27 +02:00
Thomas Sutter
bfd5214cd5 Add read_without_encryption command. 2019-10-24 16:08:44 +02:00
Thomas Sutter
94ec36de20 Add status flag interpretation. 2019-10-24 11:59:58 +02:00
Thomas Sutter
003aada18f Add basic read_without_encryption command. 2019-10-24 11:30:52 +02:00
Thomas Sutter
94cc2c0473 Merge remote-tracking branch 'upstream/master' into felica_support_request_service 
# Conflicts:
#	client/cmdhffelica.c
 2019-10-24 08:53:41 +02:00
Thomas Sutter
3b0447fbb3 Draft read without encryption 2019-10-24 08:44:20 +02:00
Philippe Teuwen
ff9eabdab5 coverity 226329 invalid type for printf 2019-10-24 01:35:58 +02:00
Thomas Sutter
1f7dd3e2a7 Add request response command for felica Mode. 2019-10-23 14:48:23 +02:00
Thomas Sutter
bdbb4cb5c9 Refactor request service parsing. 
Change Examples.
 2019-10-23 13:25:52 +02:00
Thomas Sutter
21f0095029 Make Style. 2019-10-23 09:42:45 +02:00
Thomas Sutter
2274383129 Remove crc methode. Add CRC macro. 
Change help text for request service.
 2019-10-23 09:21:43 +02:00
Thomas Sutter
c122483794 Merge remote-tracking branch 'upstream/master' into felica_support_request_service 
# Conflicts:
#	client/cmdhffelica.c
 2019-10-22 17:16:50 +02:00
Thomas Sutter
b6117e4996 Add parameter a to usage text. 2019-10-22 17:10:32 +02:00
Thomas Sutter
3f56116615 Add felica request service all nodes command. 
Make style.
 2019-10-22 17:03:54 +02:00
Thomas Sutter
6144e2d09b Add felica request service command. 
Add cmd parser functions.
 2019-10-22 15:56:05 +02:00
Philippe Teuwen
8792679fc8 make style 2019-10-21 13:46:23 +02:00
Philippe Teuwen
e54edfd8db wiegand: use ARRAYLEN 2019-10-21 13:44:08 +02:00
Thomas Sutter
e7f7810d22 Make style. Change DBG_DEBUG. Refactor CRC calculation 2019-10-21 09:59:15 +02:00
Thomas Sutter
3a3b66d079 Fix build 2019-10-20 20:28:57 +02:00
Thomas Sutter
a3f8d635ca Add new cmd parser functions. 2019-10-20 20:26:00 +02:00
grspy
7cbac6067e
Fix pack in dump 
PACK wasn't included in the output dump due to incorrect check of ul_auth_select return value
 2019-10-20 20:08:52 +03:00
Thomas Sutter
ce4c651853 Merge remote-tracking branch 'upstream/master' into felica_support_request_service 
# Conflicts:
#	armsrc/felica.c
#	client/cmdhffelica.c
 2019-10-20 18:40:16 +02:00
Thomas Sutter
f7d4f2e9f3 Unfinished request service commands. 2019-10-20 18:28:07 +02:00
iceman1001
2f573ebfb3 fix: unshadow 2019-10-20 06:31:49 -04:00
iceman1001
339f499a25 fix: unshadow 2019-10-20 06:30:09 -04:00
iceman1001
2ba8d07e1b fix: unshadow 2019-10-20 06:28:49 -04:00
iceman1001
6091894b72 fix: unshadow 2019-10-20 06:25:29 -04:00
iceman1001
7b2b49ff73 fix: sanity check 2019-10-20 06:24:46 -04:00
iceman1001
29573f1ac5 fix 2019-10-20 06:23:57 -04:00
iceman1001
b0e01f9236 fix: double free 2019-10-19 16:46:11 -04:00
iceman1001
e5df52fb86 fix: bools 2019-10-19 16:42:37 -04:00
iceman1001
4ab4746104 fix: bad bool 2019-10-19 16:39:28 -04:00
iceman1001
c9a390a480 fix 2019-10-19 16:35:21 -04:00
iceman1001
1694eaef0a detect iClass vs PicoPass 2019-10-19 15:38:53 +02:00
iceman1001
f094e8fd50 Add - automatic try LF and HF search and if both fail, try lf read and save a trace file 2019-10-19 13:13:00 +02:00
iceman1001
65f7d8cac9 add: 'script run init_rdv4' - lua script to help setup your RDV4 initally 2019-10-17 23:05:15 +02:00
iceman1001
a823c7821f chg: 'sc upgrade' - ignore case on all platforms 2019-10-17 22:30:18 +02:00
iceman1001
ed565d04f5 chg: remark available in lua 2019-10-17 22:28:49 +02:00
iceman1001
2c4e660605 fix 2019-10-17 22:24:32 +02:00
iceman1001
9fdc29e91c chg: 'hf search' - add FeliCa detection 2019-10-17 21:58:57 +02:00
Iceman
a5e94c5a1d
Merge pull request #443 from 7homasSutter/master 
Add reader and raw command for FeliCa standard cards
 2019-10-17 14:02:22 +02:00
Philippe Teuwen
945fb82b48 make style 2019-10-17 13:58:22 +02:00
Thomas Sutter
376e367d45 Make Style and remove some comments. 2019-10-17 13:48:34 +02:00
Thomas Sutter
97f85ba50a Remove printf from client. Ready for testing. 2019-10-17 12:54:56 +02:00
Thomas Sutter
4da87d3f96 Fix Client Response for RAW command. Client should receives now all response octects. 2019-10-17 11:46:59 +02:00
iceman1001
2ae2e1fff5 textual 2019-10-17 09:31:37 +02:00
iceman1001
5c0dfdbf6b chg: send ref instead 2019-10-17 09:27:55 +02:00
iceman1001
ce4711cc13 revert printf 2019-10-16 15:45:52 +02:00
iceman1001
801ace94a2 dummy gui compilation on OSX.. 2019-10-16 15:37:39 +02:00
iceman1001
224b03a1f8 chg printf.. 2019-10-16 15:09:20 +02:00
iceman1001
5737355985 chg renable win ansi test. trying turning offlogging. @doegox can refacor this away when we get a prefs.json settings file 2019-10-16 14:46:57 +02:00
Thomas Sutter
9d3331511b Fix FeliCa select_card. Selection works now for FeliCa standard cards. 
Fix SendRaw data.
Add some new unfinished cmds.
 2019-10-16 14:17:52 +02:00
Iceman
d401041ed9
Merge pull request #440 from mwalker33/dev2 
Removed Windows 10 color option.
 2019-10-16 11:33:14 +02:00
mwalker33
c3c45e03ce Update proxmark3.c 2019-10-16 20:24:03 +11:00
iceman1001
cce04ef93c textual 2019-10-16 10:57:14 +02:00
Philippe Teuwen
f9bf50e20b add xrefs between t55 menu and lf clone commands 2019-10-16 10:48:03 +02:00
Philippe Teuwen
abf81bbbb7 log help as well, for consistent logging experience 2019-10-16 10:43:44 +02:00
iceman1001
726c421b1e textual 2019-10-16 10:38:05 +02:00
iceman1001
cec9330a79 textual 2019-10-16 10:32:50 +02:00
iceman1001
db3da4d224 textual 2019-10-16 10:28:53 +02:00
iceman1001
bae3f65db6 textual 2019-10-16 10:22:41 +02:00
Philippe Teuwen
3fce47d023 Add hw tia to trigger a new Timing Interval Acquisition 2019-10-15 15:02:34 +02:00
iceman1001
bd13f72a59 textual 2019-10-14 22:32:58 +02:00
Philippe Teuwen
47d6eef7c9 usage 2019-10-13 01:21:59 +02:00
Philippe Teuwen
395d0f9ebf make style 2019-10-13 00:48:26 +02:00
Philippe Teuwen
63711dd312 fix gcc8 failure, man sprintf: 
Some programs imprudently rely on code such as the following
sprintf(buf, "%s some further text", buf);
to append text to buf.  However, the standards explicitly note that the results are undefined if source and destination buffers overlap  when  calling  sprintf(),  snprintf(),  vsprintf(),  and  vs‐
nprintf().  Depending on the version of gcc(1) used, and the compiler options employed, calls such as the above will not produce the expected results.
 2019-10-13 00:31:21 +02:00
Philippe Teuwen
a41914947a
Merge pull request #435 from mwalker33/master 
T55xx save and restore (.bin, .eml)
 2019-10-13 00:18:22 +02:00
iceman1001
b745602d8c Motorola. FC guessing. CSN mapped straight from Indala descramble. 2019-10-12 12:36:09 +02:00
mwalker33
44b25cc6ac Update cmdlft55xx.c 
removed extra comma.
 2019-10-12 17:55:23 +11:00
iceman1001
354c5f2ea8 q 2019-10-11 23:13:58 +02:00
iceman1001
71baf71e17 Add 'lf motorola *' commands. Old grey Motorola cards, presumably Flexpass, which operates in 74 kHz, PSK1 , Clock 32. No chance a t55x7 can clone it :), simulation should be doable 2019-10-11 23:13:52 +02:00
mwalker33
6787144dbc Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-10-11 21:16:52 +11:00
mwalker33
25182d8e2f Update cmdlft55xx.c 
Fix travis initilisation error.
 2019-10-11 21:16:28 +11:00
mwalker33
33ed92849c
Merge branch 'master' into master 2019-10-11 20:42:36 +11:00
mwalker33
f109915ebd T55xx Save and Restore 2019-10-11 20:29:20 +11:00
iceman1001
9c82f84fa7 analyze demodbuff - fill demodbuffer with binary from client 2019-10-11 11:26:14 +02:00
martinbeier
baffd45d5a
fixed indala FC decoding 2019-10-10 16:01:54 +02:00
iceman1001
d61a7b4a0f textual 2019-10-10 15:10:22 +02:00
mwalker33
67b575c728
Merge pull request #18 from RfidResearchGroup/master 
Update from RRG
 2019-10-10 23:40:04 +11:00
martinbeier
1262270924
added indala 26bit decoding 2019-10-10 14:25:41 +02:00
mwalker33
f0ae164fdf Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into RfidResearchGroup-master 2019-10-10 23:13:20 +11:00
iceman1001
ed4cdc8b75 coverity 226411 2019-10-10 13:11:29 +02:00
mwalker33
18520a5dfd Update cmdlft55xx.c 2019-10-10 22:07:57 +11:00
iceman1001
f6c1e73378 coverity 263230 2019-10-10 12:34:11 +02:00
mwalker33
1181a9792e Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-10-10 21:29:57 +11:00
mwalker33
e435d8a6ff t55x7 save and restore eml/bin 2019-10-10 21:27:48 +11:00
Philippe Teuwen
c2b448de0f elite_crack: static include else we get issue with gcov 2019-10-10 12:02:01 +02:00
iceman1001
9be5627537 should unify authors messages, remove from individual functions that was done for awhile 2019-10-10 11:37:36 +02:00
iceman1001
371a0e3ee0 coverity 226308 2019-10-10 11:13:14 +02:00
iceman1001
b62e4dfa36 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-10 10:24:21 +02:00
iceman1001
762075f34a textual 2019-10-10 07:56:39 +02:00
Philippe Teuwen
904f0fe2fd coverity 226229 2019-10-10 00:08:30 +02:00
Philippe Teuwen
755ac62ab8 coverity 226422 2019-10-09 23:38:41 +02:00
Philippe Teuwen
b6c683bd02 coverity 226304 2019-10-09 23:34:19 +02:00
Philippe Teuwen
f4ec8463a4 coverity 226367 - strange indala code 2019-10-09 23:31:22 +02:00
Philippe Teuwen
209fa45107 coverity 226215 2019-10-09 22:44:25 +02:00
Philippe Teuwen
d3efe5342c misspelled fct 2019-10-09 22:32:38 +02:00
Philippe Teuwen
7b482c64b1 coverity 226188 2019-10-09 22:29:42 +02:00
Philippe Teuwen
b7d543888c coverity 226272 2019-10-09 22:24:54 +02:00
Philippe Teuwen
31cf435045 coverity 226359 2019-10-09 21:55:01 +02:00
Philippe Teuwen
54585089a3 coverity 226339 2019-10-09 21:36:29 +02:00
Philippe Teuwen
31efbf9a59 coverity 226275 2019-10-09 21:17:27 +02:00
Philippe Teuwen
30168d1e20 coverity 226247 2019-10-09 21:14:55 +02:00
Philippe Teuwen
e3b267112f coverity 226372 - leak 2019-10-09 21:07:33 +02:00
Philippe Teuwen
5017e33b6d coverity 226232 - tainted input 2019-10-09 19:44:06 +02:00
Philippe Teuwen
8b99cd0303 Add SKIPQT makefile var 2019-10-09 19:28:37 +02:00
David Lam
906193981f textual changes 2019-10-09 12:48:45 -04:00
Philippe Teuwen
d588b04537 fix more printf api warnings/bugs 2019-10-09 18:03:56 +02:00
iceman1001
69274a1184 fix 2019-10-09 15:23:58 +02:00
iceman1001
d8dba632be coverity 226322 - resourceleak 2019-10-09 15:06:22 +02:00
iceman1001
0556c83570 fixes 2019-10-09 14:30:50 +02:00
iceman1001
9b0e70ca27 fixes 2019-10-09 14:28:52 +02:00
iceman1001
55c33e75ef coverity 226254... - printf 2019-10-09 14:25:13 +02:00
iceman1001
16f1866943 coverity 226410 - printf 2019-10-09 14:22:35 +02:00
iceman1001
f1b15d8e07 coverity 226425 - printf 2019-10-09 14:21:09 +02:00
iceman1001
be51e98d7c coverity 226361 - printf 2019-10-09 14:19:10 +02:00
iceman1001
3ba529612e coverity 226321 - printf 2019-10-09 14:17:28 +02:00
iceman1001
26c8f680fc coverity 226289 - printf 2019-10-09 14:14:27 +02:00
iceman1001
81e7e34a24 revert tainted 2019-10-09 13:44:51 +02:00
iceman1001
ab222a06b9 ..revert 2019-10-09 13:19:47 +02:00
iceman1001
3361715121 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-09 13:11:26 +02:00
iceman1001
8842421422 coverity 71844 - fix untrusted value. fgets could have nulled the pointer. 2019-10-09 13:11:22 +02:00
Philippe Teuwen
86a47a3282 dangerous stuff... 2019-10-09 13:03:23 +02:00
iceman1001
2b50ccbef8 coverity 226404 - fix ignoring number.. 2019-10-09 13:00:22 +02:00
iceman1001
201817d7e4 coverity 226430 - printf args 2019-10-09 12:56:11 +02:00
iceman1001
b9c020a1dd coverity 227802 - fix uninitialized 2019-10-09 12:46:01 +02:00
iceman1001
0aa88aecf5 coverity - fix tainted 2019-10-09 12:45:12 +02:00
iceman1001
6d3adf71b6 coverity 226370 - fix resource leak 2019-10-09 12:44:17 +02:00
iceman1001
b993819b92 coverity 226268 - fix resource leak 2019-10-09 11:52:38 +02:00
iceman1001
08e62afc59 coverity 226277 - fix resource leak 2019-10-09 11:50:55 +02:00
iceman1001
cd0a47308d coverity 226337 - fix resource leak 2019-10-09 11:47:56 +02:00
iceman1001
84f5f0352f coverity 226350 - fix resource leak 2019-10-09 11:46:11 +02:00
iceman1001
6835cfd76a textual 2019-10-09 11:21:53 +02:00
iceman1001
b463f2ab5a coverity 226340, make sure its not null 2019-10-09 10:48:20 +02:00
iceman1001
abb011c179 fix: wrong key copied 2019-10-09 10:41:59 +02:00
iceman1001
ba461b8e1b fix: wrong size when going to calloc 2019-10-09 10:39:36 +02:00
iceman1001
0a50d8f845 adjustments 2019-10-08 22:02:02 +02:00
iceman1001
10a4361ccc Add: 'lf gallagher *' support. Unknown how to decode to printed number yet. 2019-10-08 21:45:40 +02:00
iceman1001
7affb00e76 textual 2019-10-08 19:55:01 +02:00
iceman1001
3a63b72741 Chg: 'hf mf autopwn' - skip extra checks if all keys found on first check 2019-10-08 19:49:34 +02:00
David Lam
96bc4438e9 remove extra spaces 2019-10-08 12:42:51 -04:00
iceman1001
3586cad12f freMerge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-10-08 16:13:46 +02:00
Philippe Teuwen
e7a632292d fix t55 comments 2019-10-08 16:13:36 +02:00
iceman1001
85f5498163 yes 
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
 2019-10-08 16:13:05 +02:00
iceman1001
6d1e109c82 filechecks.. could fail stat call and directory could be symlinked 2019-10-08 16:11:01 +02:00
Philippe Teuwen
813f1e228c fix nedap examples 2019-10-08 16:10:50 +02:00
iceman1001
c4249ecbb8 WiP - 'lf t55xx restore' - read a dump file and restore it to a t55xx card 2019-10-08 15:24:06 +02:00
iceman1001
9cbfe5481b chg: lf t55xx brute / lf t55xx chk / lf t55xx recoverpwd - now shows help when called without params 2019-10-08 14:16:46 +02:00
Philippe Teuwen
caf1ce4a43
Merge branch 'master' into master 2019-10-08 14:03:32 +02:00
mwalker33
275c628da5 lf t55xx detect and help 
Added lf t55xx detect to try without password first and try password if still not detected.
Added password status to detected output.

Updated lf t55xx help to show current default downlink mode.

typo fixed in win10 color help
 2019-10-08 21:46:36 +11:00
iceman1001
810a70d8a8 tweak? 2019-10-08 11:50:43 +02:00
iceman1001
1baf51b862 t5577-M3 ATMEL info, thanks @doegox 2019-10-08 11:49:23 +02:00
David Lam
b2592a2f1c display high bit for Kastle HID to allow for lf hid clone 2019-10-07 14:56:20 -04:00
iceman1001
9a74122079 fix: 'lf indala clone' - now write long id again 2019-10-07 17:18:56 +02:00
Iceman
13cdba28f3
Merge pull request #422 from bruno-/fix_script_typos 
Fix Legic_clone.lua script typos
 2019-10-07 15:20:26 +02:00
Bruno Sutic
bf14b91a85
Fix Legic_clone.lua script typos 2019-10-07 14:57:53 +02:00
Iceman
27ae47b38e
Merge pull request #420 from mwalker33/master 
Color on windows 10
 2019-10-06 20:00:59 +02:00
Philippe Teuwen
1f364106ce fix few mem leaks 2019-10-06 01:18:04 +02:00
Philippe Teuwen
78c153fe74 fix wrong fix 2019-10-06 00:17:32 +02:00
Philippe Teuwen
4ae8a3d86b fix few printf arg types 2019-10-05 23:56:19 +02:00
iceman1001
7d009a9ea7 emphase warnings 2019-10-05 12:07:28 +02:00
mwalker33
098e0a183f client win10 color support 2019-10-05 14:09:46 +10:00
iceman1001
8c9ff2e54a t5555 textual 2019-10-04 21:28:34 +02:00
iceman1001
b8776b593e fix: sneaky bug in magic detection where bigbuf wasnt emptied before next run 2019-10-04 14:21:04 +02:00
iceman1001
3d6d83726e textual 2019-10-04 10:14:38 +02:00
Philippe Teuwen
8a7274ec34 offline: avoid spurious "Sending bytes to proxmark failed" on exit 2019-10-04 09:30:36 +02:00
Philippe Teuwen
42cb2a32e8 lf config alone shows current config 2019-10-03 22:11:16 +02:00
Philippe Teuwen
159b90c002 no fct call in macro, thanks @iceman1001 2019-10-03 21:56:42 +02:00
Philippe Teuwen
156c3a81e8 no fct call in macro, thanks @iceman1001 2019-10-03 21:54:45 +02:00
Philippe Teuwen
f8cd168498 add f (freq) to lf tune & lf config 2019-10-03 21:46:06 +02:00
Philippe Teuwen
df08e7970c fix divisor<>freq computations, add q to lf tune 2019-10-03 21:18:37 +02:00
Philippe Teuwen
f29ad0fba2 macros for divisors and fix lf optimal freq display 2019-10-03 18:32:27 +02:00
Philippe Teuwen
6df9eea950 voltage config divisor printing 2019-10-03 17:45:43 +02:00
iceman1001
37ce43cb8b chg: dont log helpout 2019-10-03 16:17:25 +02:00
iceman1001
38673a10aa textual 2019-10-03 16:16:49 +02:00
iceman1001
5d3eb444fb chg 'hf mf nested' - uses NG. chg 'hw tune' - now also prints the 'lf config q' divisor voltage. 2019-10-03 16:15:47 +02:00
Philippe Teuwen
eccf0d3bbc Avoid client CPU busy loop when waiting pm3 (e.g. when simulating tag) 2019-10-01 23:00:51 +02:00
iceman1001
5def918e02 textual 2019-10-01 15:03:39 +02:00
iceman1001
af56fa8242 started to extract VeriChip demod/clone 2019-10-01 14:30:30 +02:00
iceman1001
2439f9d33c new files 2019-10-01 14:29:37 +02:00
iceman1001
f142ad139b chg 'lf cmdread' - clientside checks, less wait times on device 2019-09-30 23:18:48 +02:00
iceman1001
d40341d962 Add 'data scale h' - helptext 2019-09-30 23:17:19 +02:00
iceman1001
fd88d7448e fix 'lf t55xx resetread' - NG and better fault handling 2019-09-30 19:47:36 +02:00
iceman1001
aeab10d67f fix 'lf cmdread' - better messaging 2019-09-30 19:39:34 +02:00
iceman1001
0efbf2b9ad yes 2019-09-30 18:07:28 +02:00
iceman1001
97600ee656 iir available 2019-09-30 13:38:50 +02:00
Iceman
76b9be1a16
Merge pull request #416 from mwalker33/master 
lf config s <samples to skip> option added
 2019-09-30 13:23:29 +02:00
mwalker33
f5d7963780 lf config s update 2019-09-30 19:41:25 +10:00
mwalker33
40b1d3bea7 samples to skip (unint32_t) 
Use unit32_t for all samples to skip
 2019-09-30 19:22:26 +10:00
mwalker33
cf0d72e172 lf sniff offset 
Added samples to skip to lf config
 2019-09-29 10:43:01 +10:00
Iceman
f3910ef78f
Merge pull request #415 from mwalker33/master 
lf em4x05 wipe
 2019-09-28 12:03:49 +02:00
mwalker33
b41013ca8f Update cmdlfem4x.c 
em 4x05 wipe
 2019-09-28 14:01:28 +10:00
mwalker33
5748000afc Update cmdlfem4x.c 
em4x05 wipe
 2019-09-28 13:53:24 +10:00
iceman1001
0973d30796 rework clone 2019-09-26 21:47:48 +02:00
iceman1001
3ea2851fe6 reworked clone 2019-09-26 21:44:27 +02:00
iceman1001
8bcb219131 rework clone 2019-09-26 21:24:38 +02:00
iceman1001
ecca9fc563 rework clone 2019-09-26 21:21:13 +02:00
iceman1001
4e166cfd15 add 'lf nexwatch clone' - uses raw hex to clone to t55x7 2019-09-26 21:15:38 +02:00
iceman1001
0a967f7733 chg clone 2019-09-26 21:06:18 +02:00
iceman1001
e370d60171 add 'lf pac clone' - use raw hex to clone to t55x7 2019-09-26 20:56:18 +02:00
iceman1001
40e793eb1a chg rework t55x7 clone.. 2019-09-26 20:42:00 +02:00
iceman1001
563f6bee47 chg rework tx55 clone 2019-09-26 20:36:13 +02:00
iceman1001
4ed295b730 chg reworked t55x7 clone function 2019-09-26 20:32:33 +02:00
iceman1001
2dd77330b1 add 'lf securakey clone' - take raw hew and clone to t55x7 2019-09-26 20:31:54 +02:00
iceman1001
cfe8810407 add 'lf paradox clone' - take raw hex and clone to t55x7 2019-09-26 20:31:02 +02:00
iceman1001
0cdc2c446a less output when on NON-RDV4 platform 2019-09-26 16:39:02 +02:00
iceman1001
fa2031c97a whitespace 2019-09-26 16:30:29 +02:00
iceman1001
5d503fc5d3 textual 2019-09-26 16:29:23 +02:00
iceman1001
300014d3b7 more keys 2019-09-26 11:29:20 +02:00
iceman1001
7c2231974d clean up, explain, lesser tests for buttonpress 2019-09-26 09:54:43 +02:00
iceman1001
a6a260b422 yesMerge branch 'master' of https://github.com/RfidResearchGroup/proxmark 2019-09-26 09:02:53 +02:00
iceman1001
7e15e0612a remove debug 2019-09-25 22:13:56 +02:00
iceman1001
30d565f76c free some stack 2019-09-25 22:10:59 +02:00
iceman1001
86994cdc69 textual 2019-09-25 22:06:47 +02:00
iceman1001
048a08ec34 free up some stack 2019-09-25 22:01:51 +02:00
iceman1001
36676aac23 yes 2019-09-25 10:24:39 +02:00
iceman1001
3e22d99b03 hf mf darkside uses NG. checkbutton more seldom, shoulded interfere with syncing the prng so much 2019-09-25 10:24:34 +02:00
iceman1001
e793e90803 textual 2019-09-24 21:01:44 +02:00
Philippe Teuwen
878e394cde lf tune: remove 16b mask (thanks @iceman1001) 2019-09-24 15:44:44 +02:00
iceman1001
6ffae0e156 fix - parites needs to be reset between iterations, and resuse standard functions for clock 2019-09-24 15:27:20 +02:00
Philippe Teuwen
891a079989 textual 2019-09-24 14:59:05 +02:00
Iceman
93b242a6e5
Merge pull request #410 from mwalker33/master 
lf em 4x05_dump - print output for each block read
 2019-09-24 14:09:14 +02:00
mwalker33
bf395a6c4f Update cmdlfem4x.c 
Add lck flags and f for filename
 2019-09-24 21:42:31 +10:00
iceman1001
45318e4346 conside less than 26, to be 26bit wiegand 2019-09-24 13:08:49 +02:00
iceman1001
4707355431 textual 2019-09-24 13:07:35 +02:00
iceman1001
b2c24c8010 add - continuously measure LF antenna 2019-09-24 13:06:43 +02:00
mwalker33
87a6316f44 Update cmdlfem4x.c 
Dump print and save to .eml and .bin
 2019-09-24 19:59:54 +10:00
iceman1001
7870dd6fc0 less arrays on stack. To counter OS which has ulimit ... 2019-09-23 19:10:29 +02:00
iceman1001
f42f7c2250 'hf search' new line for 2019-09-23 18:59:45 +02:00
iceman1001
c36baab3c0 releasing pressure on stack 2019-09-23 17:10:43 +02:00
mwalker33
361136f06d Update cmdlfem4x.c 
dump display and save to file
 2019-09-23 21:04:33 +10:00
iceman1001
f30511f1a2 more.. 2019-09-22 13:04:46 +02:00
iceman1001
9cdc26207f add 'lf hid watch' , 'lf awid watch', 'lf io watch' 2019-09-22 13:04:28 +02:00
mwalker33
0ea501372b Update cmdlfem4x.c 
Added print Ascii to em 4x05_dump
 2019-09-22 19:41:45 +10:00
mwalker33
3a9087d2a1 Update cmdlfem4x.c 
em 4x05_dump did not output data
 2019-09-22 15:27:00 +10:00
Philippe Teuwen
11dcc4787d mfc magic: add some defines 2019-09-21 23:50:32 +02:00
Philippe Teuwen
d46edd9a53 change is_* return to bool 2019-09-21 20:22:17 +02:00
Philippe Teuwen
782feb934a split slow tests 2019-09-21 18:32:07 +02:00
iceman1001
e7d67fc2b0 fix for checking directory 2019-09-21 16:31:45 +02:00
iceman1001
862bf1b793 fix for ps3.2 compilation 2019-09-21 11:48:55 +02:00
iceman1001
f7510dc6aa better detection of directory (@doegox) 2019-09-21 11:12:36 +02:00
iceman1001
93915858ea fix data load now not crashing client when entering a folder path without filename 2019-09-21 08:47:12 +02:00
iceman1001
e5ffcfd513 chg: 'lf hid brute' - use new wiegand formats. see helptext for more details 2019-09-19 13:46:38 +02:00
iceman1001
a3161ae9a2 fix 'lf em 4x50_read - now checks if have enough data in Graphbuffer 2019-09-19 13:12:48 +02:00
iceman1001
aa2f80795d mem spibaud uses NG. And a simplification of tuning 2019-09-19 12:13:39 +02:00
iceman1001
a604f641b3 style 2019-09-19 10:55:34 +02:00
iceman1001
21a7de38b8 style 2019-09-19 10:54:34 +02:00
iceman1001
ffd03dadaa style 2019-09-19 10:48:32 +02:00
iceman1001
895410aec0 style 2019-09-19 10:47:12 +02:00
iceman1001
bb051df683 ..memset 2019-09-18 20:15:29 +02:00
iceman1001
2626c31d3d links 2019-09-18 19:43:55 +02:00
iceman1001
fa36018bef also compile... 2019-09-18 19:42:59 +02:00
iceman1001
7abc10c63a add: 'wiegand commands' - wiegand manipulation like encoding / decoding of credentials. From offical repo (@grauerfuchs) 
Adapted and converted to fit this repo.
 2019-09-18 19:20:07 +02:00
iceman1001
d3651cc075 chg 'hw status' - reply NG.... thanks @cjbrigato 2019-09-17 19:13:00 +02:00
merlokk
c5ea6b54ce add ignoring results of some tests 2019-09-16 17:37:18 +03:00
Oleg Moiseenko
f7ae7f44ca
Merge pull request #404 from merlokk/fido_ca 
additional fido CA
 2019-09-16 14:20:18 +03:00
iceman1001
412f016b94 chg: 'lf t55xx config' - can set config based on a block0, offset and Q5 
lf t55xx config c 000880E0 o 10     - sets a T55x7 w offset 10
lf t55xx config c 000880E0 o 6 Q5   - sets a Q5/T5555 w offset 6
 2019-09-16 12:36:04 +02:00
Philippe Teuwen
88cbf789a1
Merge pull request #403 from mwalker33/master 
Quick Typo Fix - T55xx Config Print
 2019-09-16 12:03:25 +02:00
iceman1001
e5c31886eb chg: 'lf io clone' - refactored, uses NG 2019-09-16 11:41:34 +02:00
iceman1001
4c08477ef7 chg: 'lf indala clone' - refactored , uses NG 2019-09-16 11:33:05 +02:00
iceman1001
3726df62a4 chg: enhanced verify t55xx write. 
We set config to the cloned block0,  whats left is to identify the offset,  which we try to do.
 2019-09-16 11:11:54 +02:00
mwalker33
e8ef0fe263 Update cmdlft55xx.c 2019-09-16 19:01:40 +10:00
iceman1001
8ba2f5b06c encourage 2019-09-15 21:00:38 +02:00
iceman1001
75f4a08f53 chg 'lf noralsy clone' - uses verifywrite 2019-09-15 20:56:43 +02:00
iceman1001
c2f3e4b2f3 encourage.. 2019-09-15 20:51:23 +02:00
iceman1001
19bdfd2577 chg some printing of blocks 2019-09-15 20:46:21 +02:00
iceman1001
a933eb4f9e adjusting beahavior for auto detection 2019-09-15 20:30:05 +02:00
iceman1001
44cb67c49b adjusting write validation to only print when successful in validating. Otherwise like old times. silence. 2019-09-15 20:27:50 +02:00
Philippe Teuwen
59e66ce5fd lf hid sim: add support for long ID 2019-09-15 02:00:42 +02:00
Philippe Teuwen
9275304640 lf hid clone: fix some stuff related to long ID, still clone doesn't seem to work 2019-09-15 01:36:38 +02:00
iceman1001
06809babbb chg: 'lf pyramid clone' - add verification 2019-09-15 01:33:54 +02:00
iceman1001
47724d0a1b textual 2019-09-15 01:13:52 +02:00
iceman1001
2bec009778 chg: 'lf viking clone' - now uses NG 2019-09-14 19:58:17 +02:00
iceman1001
cd28641d96 chg: 'lf visa2000 clone' - now verify successful write of blocks. 2019-09-14 19:31:00 +02:00
iceman1001
d5d273fedb fix. 2019-09-14 19:11:39 +02:00
iceman1001
54ea65bf34 Messy messy. I probably lost my commit texts now... 
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
 2019-09-14 19:02:13 +02:00
iceman1001
da197e1999 CHG: 'lf t55xx wipe c' - now accepts user provided configuration block to configure a wiped tag with. 
ADD: 'lf t55xx protect' -  Sets password and enables password protection in configuration block.   It tries to validate its writes aswell.

Samples:
lf t55xx protect n 11223344            - set pwd to 11223344
lf t55xx protect n 01020304 p 11223344 - change a password protected tag from 11223344 to 01020304

To remove the password protection, you need to remember the password :)
lf t55xx wipe p 11223344               - wipes whole tag, removes password protection bits.
 2019-09-14 18:27:58 +02:00
Ludovic Rousseau
f961c1c551 Fix typos 
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf dont don't
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf succesful successful
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf Uknown Unknown
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf requestes requests
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf unkown unknown
I: proxmark3: spelling-error-in-binary usr/share/proxmark3/firmware/fullimage.elf ambigous ambiguous
 2019-09-14 17:53:24 +02:00
Ludovic Rousseau
a1852eaa4b Fix typos 
Thanks to Debian lintian for the reports:
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 formated formatted
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 succesfully successfully
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Skiped Skipped
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 standart standard
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 supress suppress
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 successfull successful
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Succeded Succeeded
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 Overriden Overridden
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 aquire acquire
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 occured occurred
I: proxmark3: spelling-error-in-binary usr/bin/proxmark3 delimeter delimiter
 2019-09-14 17:44:58 +02:00
mwalker33
c3756f1903 T55xx DLMode Update 2019-09-14 14:13:55 +10:00
iceman1001
250be16876 chg: 'lf t55 write v' - validation of data. After a write, the command tries to read the block and see if it matches the data entered. 
This can fail because of password,  not correct configuration settings before. Also validating a block0 write is harder, some modulations are not that perfect.
This is however a nice step forward.
 2019-09-13 21:25:39 +02:00
iceman1001
af02ee871d chg: 'lf t55xx info c' - renamed from "d" to "c", takes a block0 and print info. 
chg: 'lf t55xx config c'  - now takes a block0 and use as configuration.

usage:
lf t55xx config c 000880E8
lf t55xx info c 000880E8
 2019-09-13 20:50:00 +02:00
iceman1001
f1307e703c style 2019-09-13 16:32:37 +02:00
iceman1001
2b25d86392 style 2019-09-13 16:31:17 +02:00
iceman1001
8d6bde0d63 chg: 'lf em 4x50_demod' - seems the read 4x50 didnt read, it demodulated only.. 2019-09-13 15:13:18 +02:00
iceman1001
270d0821b5 chg: 'data print i' - new param I, inverts the demod buffer 2019-09-13 12:11:56 +02:00
iceman1001
f1b36c0b5a fix paradox sim compilation... 2019-09-13 07:30:03 +02:00
Philippe Teuwen
5e4243e5a1 Disable lf paradox sim, which needs non-existing GetParadoxBits 2019-09-13 00:51:18 +02:00
Philippe Teuwen
05e9ac97ae fix lf awid sim doc: must be digits 2019-09-13 00:39:19 +02:00
iceman1001
5d24d7a85b Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-09-12 21:20:51 +02:00
iceman1001
3821a03a40 chg: 'lf t55xx wipe p' - now takes a password for wipe 
chg: 'lf t55xx wakeup' - uses NG
 2019-09-12 21:20:40 +02:00
Philippe Teuwen
ed5fed8fac Attempt to fallback to current directory if no HOME in env 2019-09-12 20:16:52 +02:00
Philippe Teuwen
46574ae0f5 add get_my_user_directory() to centralize HOME processing 2019-09-12 20:13:01 +02:00
iceman1001
77a10ceb08 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-09-12 17:35:06 +02:00
iceman1001
c3a0d7d88a chg: 'lf t55xx info p' - got some more love, now can read with password :) 
chg: 'lf t55xx dump p' - less outputs and now can read with password :)
chg: 'lf t55xx trace 1' - can now decode trace from a saved trace. However you must have correct configuration set in order to work.
chg: 'lf t55xx wipe p' - now can use a password to write to configblock first.
 2019-09-12 17:34:55 +02:00
merlokk
9c61ac1375 additional fido CA 2019-09-12 16:13:36 +03:00
3ldidi94
ef281465ae
Add keys found on hardenest Mifare Classic Card 
Add keys found on hardenest Mifare Classic Card of an Hotel in Berlin (DE)
 2019-09-12 11:38:53 +02:00
Philippe Teuwen
22ead8ca0b printdemodbuffer: add option to strip leading zeroes 2019-09-12 01:24:20 +02:00
iceman1001
1ad66c917f fixin... 2019-09-11 22:51:13 +02:00
iceman1001
f57a6195de turning off field on failure 2019-09-11 16:56:08 +02:00
iceman1001
f189c5c3f8 a 
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
 2019-09-11 16:37:13 +02:00
iceman1001
312e4b358c fix: 'hf iclass reader 1' - now turns off 2019-09-11 16:36:41 +02:00
iceman1001
9f0db0bbdc textual 2019-09-11 16:23:06 +02:00
iceman1001
a623e6a246 chg: 'hf iclass list' - no parity on responses 2019-09-11 16:22:37 +02:00
merlokk
08c345e560 added yubikey link 2019-09-11 17:21:27 +03:00
Philippe Teuwen
4540b31d67 thinfilm: textual 2019-09-11 15:58:03 +02:00
iceman1001
387dd82895 chg 'hf iclass list' - fix parity checks 2019-09-11 14:03:14 +02:00
Iceman
341703d9a7 chg: 'hf iclass sim' - better iClass protocol implementation 2019-09-11 13:09:08 +02:00
Philippe Teuwen
843f554503 prevent lua bombs 2019-09-10 12:32:01 +02:00
Philippe Teuwen
608e0ba27c fix plot strange values 2019-09-10 00:06:16 +02:00
Philippe Teuwen
d08f03058b add support for (nested) cmd scripts in script list/run 2019-09-09 23:46:38 +02:00
Philippe Teuwen
e10085bfe8 log interactive commands as well 2019-09-09 21:30:25 +02:00
Philippe Teuwen
ba47ac36cb Do not log to history with -h/-t/-m 2019-09-09 21:01:43 +02:00
Philippe Teuwen
d5d2c64d50 allow to set debugmode from cli options 2019-09-09 20:45:10 +02:00
Philippe Teuwen
6385ee960f searchFile for firmwares 2019-09-09 19:55:27 +02:00
iceman1001
f7624a7767 textual 2019-09-09 17:33:44 +02:00
iceman1001
7b773c571b chg: 'lf t55xx dump p 11223344' - less verbose output. 2019-09-09 15:19:00 +02:00
Iceman
c918e0ab80 chg: 'hf search' - feedback text (@wvzlad) 2019-09-09 13:15:55 +02:00
Philippe Teuwen
afe891647f merge flasher in client 2019-09-09 01:35:15 +02:00
iceman1001
ca606bb211 stupid... 2019-09-08 23:23:06 +02:00
iceman1001
9a2a0116e4 fix: 'hf iclass clone' - last block write fails, see (https://github.com/RfidResearchGroup/proxmark3/issues/183) 
chg: 'hf iclass clone' - now tries ten times,  behavies better, obey verbose nicer, drop field constant. Uses NG.
chg: 'hf iclass dump' - now tries ten times,
in general nice outputs..
 2019-09-08 23:19:06 +02:00
iceman1001
d8217a13d9 chg: 'hf iclass rdbl' 
'hf iclass wrbl'  - both commands now tries tens times. Both honor verbose param,  both has gotten some love with regards to timing on device side,  and they also turn off the field more consistent.
 2019-09-08 21:21:30 +02:00
iceman1001
305c54f3cf chg: 'hf iclass rdbl' - now retries 10 ten times and uses NG 2019-09-08 17:37:14 +02:00
RFID Research Group
a037766e26
Update cmdhfmf.c 
chg: hf mf brute - commented out.
 2019-09-08 12:57:25 +02:00
Iceman
fbe86a9070
Update cmdhfmf.c 
Textual,  
and  HF MF KEYBRUTE is considered obselete since improved hardnested. 
Will let it still be in code for learning purposes.
 2019-09-08 12:29:10 +02:00
Philippe Teuwen
28534c10ad hf mf autopwn not available offline 2019-09-07 20:45:12 +02:00
Philippe Teuwen
a8e922271b
Merge pull request #388 from sh7d/autopwn-fix 
autopwn: fix card detection
 2019-09-07 20:07:26 +02:00
sh7d
93e323d890 Review requested changes 2019-09-07 19:41:48 +02:00
Philippe Teuwen
9ce820768c missing free 2019-09-07 12:07:09 +02:00
sh7d
710c49f763 autopwn: fix card detection 2019-09-07 11:39:49 +02:00
iceman1001
8228b66cb6 chg: \n - param not obsessed with two hexsamples. \n textual 2019-09-07 10:32:16 +02:00
iceman1001
c34660b74c free some mem 2019-09-06 17:22:54 +02:00
iceman1001
57dc1849da return 2019-09-06 16:52:05 +02:00
Iceman
f1eceab385 chg: hf iclass / hf mfu - free some 3des contexts 2019-09-06 09:00:01 +02:00
Philippe Teuwen
ffe849fb93 fixing compilation bug in iclass 2019-09-05 23:34:51 +02:00
Philippe Teuwen
9cf2cd7ca9 remove leading/tailing "/" from installation RELPATHs 2019-09-05 23:20:46 +02:00
iceman1001
1ca235e58f chg: hf iclass decrypt -d - now also reads enccrypted blockdata as param to decrypt 2019-09-05 22:39:30 +02:00
Iceman
3323126d7b adaption 2019-09-05 16:07:25 +02:00
Iceman
c9d42699fb textual 2019-09-05 15:52:40 +02:00
Philippe Teuwen
ecb535cc58 make style 2019-09-05 00:48:48 +02:00
Philippe Teuwen
f8636b18db searchFile: HOME takes precedence on repo and installed paths, more coherent 2019-09-04 23:40:42 +02:00
Philippe Teuwen
d84c039742 Example of shebang on Lua script 2019-09-04 23:36:23 +02:00
Philippe Teuwen
43055ae6a7 searchFile for cmdscripts 2019-09-04 23:29:03 +02:00
Philippe Teuwen
00ad68215b add cmdscript example 2019-09-04 23:28:19 +02:00
Philippe Teuwen
7594ea4942 skip comments in cmdscripts 2019-09-04 23:13:51 +02:00
Philippe Teuwen
2ddbbd255b data load: search file with and without extension .pm3 2019-09-04 22:53:54 +02:00
CristarIngram
15d8e246d8
more mfc keys 2019-09-03 16:10:22 +02:00
Philippe Teuwen
bccb9069f9 prepare libamiibo.a inclusion 2019-09-03 00:18:43 +02:00
Philippe Teuwen
f7f80a9b9f fido2: fix fido assert loading file 2019-09-02 22:51:28 +02:00
Philippe Teuwen
002580b6d4 fido: fix typos 2019-09-02 22:48:25 +02:00
iceman1001
f1d31f1e43 chg: 'mem load' - use loadxxxx_safe method 2019-08-31 21:49:59 +02:00
iceman1001
3352904f1d chg 'mem spiffs load' - use loadfile_safe 2019-08-31 21:47:31 +02:00
iceman1001
5ff9cbaac0 fix: 'hf iclass eload' - load file works again. 2019-08-31 15:25:36 +02:00
Philippe Teuwen
7e579f9fca rename SIMxxx.BIN in lowercase 2019-08-30 22:13:51 +02:00
Philippe Teuwen
f6a4f9cbe3 move client scripts to tools 2019-08-30 22:11:02 +02:00
Philippe Teuwen
3245260c00 Add Makefile.defs with common defs 2019-08-30 22:10:06 +02:00
Philippe Teuwen
d772c6169a rename flasher -> proxmark3-flasher 2019-08-30 21:57:43 +02:00
Philippe Teuwen
4fdb5a2f4b make install: half way 2019-08-30 21:55:13 +02:00
Philippe Teuwen
b5f5b9276f make install skeleton 2019-08-30 21:44:40 +02:00
Philippe Teuwen
4d31b2399b reintroduce PREFIX and use relative paths for finding share/ when installed, independently of PREFIX 2019-08-30 21:36:10 +02:00
iceman1001
e1e5687e32 add: lua scripts can now search for files. 2019-08-30 14:53:53 +02:00
Oleg Moiseenko
4433f8982c
Appveyour fix paths (#379) 2019-08-30 13:55:35 +03:00
Philippe Teuwen
2022df1068 make style 2019-08-30 10:45:52 +02:00
Philippe Teuwen
2c853d94ea move hardnested tables to resources/ 2019-08-30 09:02:01 +02:00
Philippe Teuwen
eba13925e4 move bf_bench_data.bin to resources/hardnested_* 2019-08-30 08:53:24 +02:00
iceman1001
0771f0ae95 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-30 08:52:06 +02:00
iceman1001
f6fa2c4651 moved to docs 2019-08-30 08:51:55 +02:00
Philippe Teuwen
08a5de1f0e searchFile traces 2019-08-30 08:32:34 +02:00
Philippe Teuwen
40709f4536 move defparams.json to resources/emv_defparams.json 2019-08-30 02:18:14 +02:00
Philippe Teuwen
382129205f move capk.txt to resources/ 2019-08-30 02:10:55 +02:00
Philippe Teuwen
c6ac4056d3 fix iclass txt 2019-08-30 02:01:14 +02:00
Philippe Teuwen
5b6af929ab move oid.json to resources/ 2019-08-30 02:00:41 +02:00
Philippe Teuwen
af65beb987 move aidlist.json to resources/ 2019-08-30 01:23:50 +02:00
Philippe Teuwen
ca8aee33ea move iclass_dump.bin in resources/ 2019-08-30 01:23:10 +02:00
Philippe Teuwen
de5c5df732 remove debug print 2019-08-30 00:08:31 +02:00
iceman1001
4d073ae19d mv iclass_dump.bin one folder up 2019-08-29 21:49:54 +02:00
Philippe Teuwen
73cefedd61 remove entirely ncurses, not needed nowadays 2019-08-29 18:22:14 +02:00
iceman1001
6529c9616f chg: remove termcap and use pkg-config for ncurses (@ZeroChaos-) 2019-08-29 16:56:22 +02:00
iceman1001
f3a63767ed chg: 'hf iclass loclass t' - now uses loadfile_safe. However the iclass_key.bin and iclass_dump.bin must be in the new folder structure 2019-08-29 15:55:52 +02:00
iceman1001
00f82304e2 chg: 'hf iclass loclass t' - now uses loadfile_safe 2019-08-29 14:33:09 +02:00
iceman1001
f0d73dc3d1 chg: 'hf iclass decrypt' - now takes transport key as param. also search for key / dump. Also saves decrypted to bin/eml/json_decref 
chg: 'hf iclass encrypt' - now takes transport key as param.
 2019-08-29 14:17:39 +02:00
Philippe Teuwen
0d6a29197b rework OS/ARCH info 2019-08-29 11:10:54 +02:00
iceman1001
74f96be6be textual 2019-08-29 10:46:57 +02:00
iceman1001
c3c5011e1d textual 2019-08-29 10:36:48 +02:00
Philippe Teuwen
b10edbaddc user dir: rework err msgs 2019-08-29 10:31:37 +02:00
Philippe Teuwen
fcd9b42dca reintroduce _stat on mingw, needed to strip path 2019-08-29 10:07:40 +02:00
iceman1001
6e54adcb7c fix: 'hw version' - identifing os on unknown.. 2019-08-29 09:53:28 +02:00
iceman1001
979f3aba2e chg: 'hf iclass chk' 
chg: 'hf iclass lookup'  - use fileutils load dictionary instead.

chg: 'hf iclass encrypt' - start w change to allow for key parameter
 2019-08-29 07:47:17 +02:00
iceman1001
3683cd88c6 chg: 'hw version' - simple os detection. 2019-08-29 07:45:09 +02:00
Matthias Konrath
a69fbdd3af Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into autopwn_restyle 2019-08-29 06:17:27 +02:00
Philippe Teuwen
430c53a7ac Fix buffer allocation again, just getting rid of it 2019-08-28 23:51:52 +02:00
Philippe Teuwen
aa77f7298c Fix buffer allocation for showing compiler version 2019-08-28 23:28:28 +02:00
Philippe Teuwen
11c7db3523 Get ~/.proxmark3 working on Mingw 2019-08-28 23:07:23 +02:00
Philippe Teuwen
d2d58db985 Move history and logfile to ~/.proxmark3 2019-08-28 21:53:31 +02:00
iceman1001
117ebf0beb chg: 'hf mf ecfill' - now uses NG format. 
chg: 'hf mf eload'  - now uses NG format.
chg: 'hf mf fchk m' - now uses ecfill trick,  if fchk got all keys,  it will dump the card directly.
    sample:
         hf mf fchk 1 m     (must have dictionaries uploaded to device) if all keys are found,  you can now run
         hf mf esave         to get a complete dump.
 2019-08-28 21:21:27 +02:00
iceman1001
8d9751ebe4 fix: uint cant be negative.. 2019-08-28 21:16:09 +02:00
iceman1001
ad3fe38b45 fix: loaddictionary_save, now with correct mem clear. 2019-08-28 21:15:32 +02:00
iceman1001
f3ab9632f0 return values 2019-08-28 21:12:32 +02:00
Philippe Teuwen
cbca61f6ba searchAndList: hide temptative repo path 2019-08-28 19:25:15 +02:00
Matthias Konrath
e4159b7cb3 Cleaned up the ouput to be as minimalistic as possible. Now the verbose flag output is realy verbose. 2019-08-28 18:39:01 +02:00
Matthias Konrath
2e29b361c5 Restyled the autopwn command output according to @doegox 2019-08-28 15:57:21 +02:00
Matthias Konrath
6c76e2ed5b Restyled to the autopwn command output. 2019-08-28 14:20:52 +02:00
Iceman
86790df6e7
Merge pull request #364 from matthiaskonrath/load_dictionary_safe 
Implementation of a function to safely load a dictionary
 2019-08-28 12:55:08 +02:00
Matthias Konrath
5167507a83 Fixed the loadFileDICTIONARY_safe memset alignment. Thanks to @doegox for pointing that out. 2019-08-28 12:14:40 +02:00
Matthias Konrath
2290b2bd88 Fixed the description of the loadFileDICTIONARY_safe function. 2019-08-28 11:30:30 +02:00
Matthias Konrath
7237a9638b Removed debugging stuff. 2019-08-28 11:19:54 +02:00
Matthias Konrath
e259b26d60 Streamlined the naming conventen and types. 2019-08-28 10:45:45 +02:00
Matthias Konrath
7eb79732ff Added security features to the loadFileDICTIONARY_safe function (memset after a realloc). 2019-08-28 10:38:56 +02:00
Matthias Konrath
1ce10cfea6 Added additional checks (loadFileDICTIONARY_safe). 2019-08-28 10:09:01 +02:00
Matthias Konrath
ae7b0de2c9 Fixed a typo and added and improved the checks for the returned data of loadFileDICTIONARY_safe. 2019-08-28 09:49:21 +02:00
Matthias Konrath
9dc3c39a95 Added additional checks to the from load dictionary returned data points. 2019-08-28 09:45:11 +02:00
Matthias Konrath
225b18d5fc Implemented a function to safely load dictionaries. 2019-08-28 09:34:46 +02:00
Philippe Teuwen
254beefda2 Fix mingw utf8->cp850 support 2019-08-28 00:03:27 +02:00
Philippe Teuwen
4fe7c7c9fa remove utf8 dashes 2019-08-27 23:17:02 +02:00
iceman1001
4b8c80ec33 return values.. 2019-08-27 21:56:03 +02:00
Matthias Konrath
a0c2de5602 Added an key found message to the read b key with a key feature. 2019-08-27 20:28:28 +02:00
Matthias Konrath
42d58cbced fixed the read B key features error handling. 2019-08-27 19:55:45 +02:00
Matthias Konrath
c9a02adc70 Added the read B key with known A key feature, and minor changes to the UI (alignment). 2019-08-27 19:45:37 +02:00
Matthias Konrath
02c1657594 Added some found keys to the dictionary. 2019-08-27 19:17:52 +02:00
Philippe Teuwen
d88b76beda partial make style 2019-08-27 17:28:08 +02:00
iceman1001
13aa4ee6ab fix: cleaning up 'hf mf autopwn' - reused the fix from below aswell. 
Add: 'hf mf dump'  rename filenames (@mohemiv) see https://github.com/RfidResearchGroup/proxmark3/pull/360
 2019-08-27 17:15:42 +02:00
iceman1001
703329faca chg: add used known key to found list :) 2019-08-27 11:08:03 +02:00
iceman1001
48d3802d35 chg: optimization of iclass mac calculations on deviceside (@pwpiwi) see https://github.com/Proxmark/proxmark3/pull/861 
chg: some textual
 2019-08-27 10:51:52 +02:00
Matthias Konrath
1e648088b1 Improved the help message of the autopwn command. 2019-08-26 22:54:59 +02:00
Philippe Teuwen
16a7cfd7b2 make style (excepted cmdhficlass...) 2019-08-26 22:28:39 +02:00
Philippe Teuwen
9c677e045e mf autopwn: try nested harder before hardnested; typos 2019-08-26 22:21:23 +02:00
Philippe Teuwen
d838c81601 hf mf attacks: rewordings 2019-08-26 20:57:23 +02:00
Philippe Teuwen
1368595be1 hf mf nested: swap loops for faster results (try harder to break keyA first) 2019-08-26 20:37:33 +02:00
Philippe Teuwen
bdd6ef98b5 fix autopwn help 2019-08-26 20:34:16 +02:00
Iceman
d548b8daeb
Merge pull request #353 from matthiaskonrath/hardnested_autopwn 
Autopwn
 2019-08-26 15:12:21 +02:00
Matthias Konrath
236c2eb1d0 Changed createKeyDump to a less generic name (createMfcKeyDump). 2019-08-26 14:29:21 +02:00
Philippe Teuwen
1628ac8e62 revert temporarily hf iclass chk/lookup 2a1e6dff 2019-08-26 13:55:42 +02:00
Philippe Teuwen
7076df0e18 hf mf chk/fchk: don't stop on line errors when parsing dict 2019-08-26 13:53:23 +02:00
Philippe Teuwen
6ac9d2f0fb lf t55xx chk: load dic with searchFile 2019-08-26 13:46:53 +02:00
Philippe Teuwen
2a1e6dff80 hf iclass chk/lookup: load dic with searchFile and fail when errors in args 2019-08-26 13:36:37 +02:00
Philippe Teuwen
4ddc3d61d5 hf mf chk/fchk: load dic with searchFile and fail when errors in args 2019-08-26 13:21:03 +02:00
Matthias Konrath
2edee59837 Changed the variable names, added aditional dictionary size checks, fixed a corner case with the key transferes. 2019-08-26 12:27:40 +02:00
iceman1001
2e4c7f4f8d chg: reuse code 2019-08-26 10:52:07 +02:00
Matthias Konrath
13641771ba Improved help message, implementation of a verbose option (to reduce the output), corrected some spelling mistakes and cleaned up variable names. 2019-08-25 22:24:52 +02:00
Matthias Konrath
47b2c5ddc6 Removed old command options. 2019-08-25 11:16:10 +02:00
Matthias Konrath
bd01b7bd96 Now the keys are transfered to the simulator memory and the whole card gets dumped at the end. 2019-08-25 11:13:53 +02:00
Matthias Konrath
7dbb5427ea Transformation from hardautopwn to autopwn, now are all the mifare classic attacks automated. 2019-08-24 18:11:03 +02:00
iceman1001
f9d8d56317 add iclass json dump format 2019-08-24 13:16:28 +02:00
Philippe Teuwen
ec174a7232 better searchFile api 2019-08-24 07:51:24 +02:00
Philippe Teuwen
7ab7d68a26 calloc in fileutils 2019-08-24 07:18:45 +02:00
iceman1001
c6145a81c2 chg: iclass commands 2019-08-24 05:08:03 +02:00
Philippe Teuwen
9d05628c3c mem load: update examples 2019-08-23 23:21:20 +02:00
Philippe Teuwen
b09849c91b pull filenamemcopy out of searchFile 2019-08-23 23:07:05 +02:00
Philippe Teuwen
4b95be1b39 searchFile: search also implicit relative path 2019-08-23 22:09:54 +02:00
Philippe Teuwen
8c26e07ceb use searchFile to find dictionaries 2019-08-23 22:08:36 +02:00
Philippe Teuwen
34a0fdb9d6 reorganize lua script dir defs 2019-08-23 22:07:45 +02:00
Philippe Teuwen
31e430744b searchFile: use filenamemcopy 2019-08-23 21:49:58 +02:00
Philippe Teuwen
e0cdb5d7a7 makefile: allow override of install paths 2019-08-23 21:07:20 +02:00
Philippe Teuwen
c709ee7c10 rework PREFIX for future make install 2019-08-23 20:55:50 +02:00
Matthias Konrath
87cbf3aa70 Improved the reliability, speed and redability. Ready for a pull mr. iceman ;) 2019-08-23 17:17:17 +02:00
Iceman
4b2b103e80
Update mfc_default_keys.dic 
data from forum,
 2019-08-23 15:23:55 +02:00
Philippe Teuwen
440c05cdfa searchFile accepts also explicit absolute or relative path 2019-08-23 00:08:19 +02:00
Philippe Teuwen
3ebc00854b Add searchAndList & searchFile in fileutils 2019-08-22 23:55:37 +02:00
Philippe Teuwen
e8efeacc57 remove ON_DEVICE from fileutils 2019-08-22 23:07:52 +02:00
Philippe Teuwen
77c86099cc clean and uniformise dic files 2019-08-22 22:58:16 +02:00
Philippe Teuwen
23044c00d0 rename and move dict files 2019-08-22 22:16:33 +02:00
Philippe Teuwen
915c200ebc luascript: use fileExists 2019-08-22 21:18:37 +02:00
Philippe Teuwen
72392ab305 fileutils: fix rel path to includes 2019-08-22 21:18:14 +02:00
Philippe Teuwen
9825f521b4 Fix clang issue where generated .d are sometimes newer than .o 2019-08-22 21:05:45 +02:00
Philippe Teuwen
40b6956a22 script list: print dir tree 2019-08-22 19:53:23 +02:00
Philippe Teuwen
595b8a1885 introduce PREFIX for pm3 system directory and move to common.h 2019-08-22 19:36:20 +02:00
iceman1001
ab38130c3e chg: some more checks in pathing 2019-08-22 17:44:08 +02:00
Matthias Konrath
abb69e2dc9 Further improved the hardautopwn feature. 2019-08-22 14:55:06 +02:00
Matthias Konrath
407078d90a Experimental hardautopwn implementation. 2019-08-22 12:49:26 +02:00
Philippe Teuwen
9ae27cd73c scripts list / scripts run: look also in the new lua scripts paths 2019-08-22 00:32:15 +02:00
Philippe Teuwen
3c6500a1b2 Lua: look for scripts also in ~/.proxmark/{luascripts,lualibs} and /usr/local/share/proxmark3/... 2019-08-21 23:53:27 +02:00
Philippe Teuwen
a8ee33baf4 change scripts/ to luascripts/ 2019-08-21 23:17:01 +02:00
Philippe Teuwen
fb00690957 rename and +x few eml helper scripts 2019-08-21 22:45:06 +02:00
Iceman
56267ea623 readd fileutils 2019-08-21 14:43:22 +02:00
Iceman
a0f261c1e0 chg: moved fileutils from loclass 2019-08-21 14:41:33 +02:00
Iceman
4e627f09c0 add: proxmark3 -v/--version - for easiness to detect version in offline mode and installs 2019-08-21 12:52:59 +02:00
Iceman
fea5d88278 add: detect unfused / write once magic tags, from https://github.com/nfc-tools/libnfc/pull/554 2019-08-20 14:53:52 +02:00
Philippe Teuwen
589f1e9d3e client/Makefile: add missing deps 2019-08-19 21:50:16 +03:00
Philippe Teuwen
0449527e2a adapt client/Makefile to new mbedtls & zlib way of working, remove unneeded dirs 2019-08-19 21:50:16 +03:00
Philippe Teuwen
0115efe190 isolate reveng, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen
6ebae499aa rework fpga_compress & isolate zlib: use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen
aebfe0af19 rework mfkey Makefile and move util_posix to common, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen
829934886f rework tinycbor Makefile, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen
7b78833800 rework liblua Makefile and skip clients compilation, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen
9767c075d9 rework jansson Makefile, use Makefile.host 2019-08-19 21:50:16 +03:00
Philippe Teuwen
f4c810f83b allow override of CFLAG & alike, remove /opt paths 2019-08-19 21:50:16 +03:00
iceman1001
f06846e2d0 chg: 'hf iclass loclass' - break attack earlier if one csn byte recovery fails. No need to try run it. and some colors... 2019-08-19 20:24:08 +02:00
Philippe Teuwen
ab2100879e Get btpin/btfactory available in FPC DEV builds 2019-08-19 17:47:11 +02:00
root
63b47a003e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-18 17:06:58 +02:00
iceman1001
f2e77bfbe4 chg: some tabs converted 2019-08-17 15:59:11 +02:00
Philippe Teuwen
4d16f3e7d2 fix reveng: unsigned long on Mingw64 is only 32b, hopefully limits.h can help 2019-08-15 19:24:50 +02:00
Philippe Teuwen
f008b965d5 missing include 2019-08-14 23:06:14 +02:00
root
d770e4c57a remove debugstatements 2019-08-14 22:59:14 +02:00
Philippe Teuwen
a187968967 Hmm, let's try to fix reveng on 32b 2019-08-14 22:19:52 +02:00
Philippe Teuwen
2f029d0d9d remove comment 2019-08-14 21:54:43 +02:00
Philippe Teuwen
ea601f4052 fix reveng for all platforms else than WIN32 2019-08-14 21:53:04 +02:00
Philippe Teuwen
db0ac1639b em4x watch & read: collect enough samples to cover EM XL tags 2019-08-13 22:57:54 +02:00
Philippe Teuwen
252929bed4 fix lf read command parsing bug 2019-08-13 20:30:19 +02:00
cjbrigato
961f98c125 SPIFFS : FIXES FS corruption against high numbero f current losses, high number of files manipulation. FIXES LOG_BLOCK erasing handlers. FIXES Garbage Collector. Overall, SPIFFS should now be WAY MORE resilient to any form of misbehavior. In case of corrupted filesystem (should still be readable !), spamming 'mem spiffs check' from the client will ensure at least 2 new free 4k blocks each tile (if number of LOG_PAGE available is enough) and in the same pass will move/reorganize the LOG_PAGES of contextual blocks. Yiha 2019-08-13 17:39:48 +02:00
iceman1001
de1093d5d9 textual 2019-08-12 16:32:27 -04:00
iceman1001
bbc324f9fe follow status pattern 2019-08-12 16:31:57 -04:00
Philippe Teuwen
01ce580e7b make btpin & btfactory accessible in BTADDON builds 2019-08-12 18:58:28 +02:00
Colin J. Brigato
cb39be8c47
Fixes Compilation on OSX 2019-08-12 12:39:16 +02:00
Philippe Teuwen
47b60d84de make style 2019-08-11 23:53:45 +02:00
Philippe Teuwen
8b0a80ec98 add missing include for whereami.c in android 2019-08-11 21:42:01 +02:00
Philippe Teuwen
3e96c27c18 remove clang warning 2019-08-11 21:42:01 +02:00
Philippe Teuwen
80b4e81130 Fix fpga_compress race condition and isolate it in tools 2019-08-11 21:42:01 +02:00
Philippe Teuwen
d19754567d summer restructuring: 
* .h include only the strict minimum for their own parsing
  * this forces all files to include explicitment their needs and not count on far streched dependencies
  * this helps Makefile to rebuild only the minimum
  * according to this rule, most standalone .h are now gone
  * big app.h is gone
  * remove seldom __cplusplus, if c++ happens, everything will have to be done properly anyway
* all unrequired include were removed
* split common/ into common/ (client+arm) and common_arm/ (os+bootloader)
  * bring zlib to common/
  * bring stuff not really/not yet used in common back to armsrc/ or client/
  * bring liblua into client/
  * bring uart into client/
  * move some portions of code around (dbprint, protocols,...)
* rename unused files into *_disabled.[ch] to make it explicit
* rename soft Uarts between 14a, 14b and iclass, so a standalone could use several without clash
* remove PrintAndLogDevice
* move deprecated-hid-flasher from client to tools
* Makefiles
  * treat deps in armsrc/ as in client/
  * client: stop on warning (-Werror), same as for armsrc/

Tested on:

* all standalone modes
* Linux
 2019-08-11 21:42:01 +02:00
Iceman
b7d412d27b Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-10 21:04:25 +02:00
Iceman
a36b784ecd chg: help text commands now green 2019-08-10 18:34:02 +02:00
Iceman
3f9613b87f chg: script run dumptoemul - better fail messages 2019-08-10 18:20:20 +02:00
Iceman
b06274623f fix: hf iclass dump - now also save EML 2019-08-10 18:05:24 +02:00
Philippe Teuwen
ceda9f9f4b
Merge pull request #310 from ViRb3/rework-help 
Rework hitag2 read/write help
 2019-08-09 22:16:21 +02:00
Philippe Teuwen
5051ea429d typo 2019-08-09 13:02:10 +02:00
Philippe Teuwen
c58937b5f5 client: clean deps while cleaning objects 2019-08-09 12:12:22 +02:00
Philippe Teuwen
5a6c9e7863 hf tune: mask 32b dword to 16b 2019-08-07 13:04:36 +02:00
Philippe Teuwen
bc28eb04e4 Revert 00350db and add waiting time extension request mechanism, see issue #265 2019-08-07 13:04:34 +02:00
Philippe Teuwen
e057fa6fa0 Add time measurements of recv packets on client side 2019-08-07 13:04:31 +02:00
Philippe Teuwen
9b44590f8d make style 2019-08-07 13:04:26 +02:00
Philippe Teuwen
12a0540d91 mf sim: add option to pass explicitly atqa/sak and reject explicitly unknown vals for option t 2019-08-07 01:32:37 +02:00
Philippe Teuwen
4615354864 mf sim: respect DBG_NONE and explicit ATQA/SAK usage 2019-08-07 00:47:32 +02:00
Victor
d158ffebfd Note that hitag1 read/write not yet implemented 2019-08-06 19:13:38 +01:00
Victor
67887a83d3 Rework hitag2 read/write help 2019-08-06 19:08:51 +01:00
Philippe Teuwen
1354aec556 typos 2019-08-06 13:51:10 +02:00
iceman1001
25748b0746 style 2019-08-05 12:01:11 -04:00
iceman1001
f317e3247a chg: 'lf nedap' - decoding / encoding of Nedap. (anon) 2019-08-05 17:43:53 +02:00
Philippe Teuwen
6f47e12797
Merge pull request #308 from cjbrigato/patch-1 
FIXes # 174 and more (OSX > 10.4 num_Cpus) the good way
 2019-08-05 00:41:20 +02:00
Philippe Teuwen
7a620ddaa7 remove redundant conditions 2019-08-05 00:31:51 +02:00
Colin J. Brigato
38e4e8d80c
FIXes OSX > 10.4 num_Cpus() the good and posix way 
sysconf() is  part of IEEE Std 1003.1-1988 (POSIX.1).
Fortunately, it *is* available to OSX `>=10.5`.
At least on `~10.14`, the old unposix `sysctl` osx way was lost, at least in portable environments.
This fixes it, but will not be compatible with OSX > 10.4. 
So i'm sorry but here we loose compatibility with Macs olders than 2005. (🤣)
 2019-08-05 00:27:15 +02:00
iceman1001
18d2c24e9e chg: 'trace list' - abort when ENTER key is pressed 2019-08-04 19:13:54 +02:00
Philippe Teuwen
f40600f997 make style 2019-08-04 16:57:06 +02:00
Philippe Teuwen
1cb039255e Add client option -i to stay in interactive mode after a script or command 
From 5a3f474331
with some fix in the logical flow
 2019-08-04 15:34:18 +02:00
Philippe Teuwen
88d2a61c0b typo 2019-08-04 12:58:36 +02:00
iceman1001
a90e5e1858 chg: legic cmds uses return macros. 
chg: hf search started to use macros
 2019-08-03 23:36:55 +02:00
Philippe Teuwen
60bfc37f35 remove more dummy cmds 2019-08-03 22:52:32 +02:00
Philippe Teuwen
61538bd635 thinfilm simulation when on battery 2019-08-03 22:37:01 +02:00
Philippe Teuwen
25f358955b make hf search robust to various HF configurations 2019-08-03 22:14:12 +02:00
Philippe Teuwen
4a3fb3ccf1 split nfcbarcode from iso14443a 2019-08-03 22:14:12 +02:00
Iceman
e4972e8810
Merge pull request #305 from ViRb3/better-warn 
Better warn user of hardcoded hitag info
 2019-08-03 20:01:18 +02:00
Philippe Teuwen
017b3357ed Comment Felica simulation in client, there is no corresponding code in ARM 2019-08-03 19:57:57 +02:00
Philippe Teuwen
a0a232a985 rename few CMD_* to get some less diversity 2019-08-03 19:48:02 +02:00
Philippe Teuwen
cbf5c717f7 Remove unused CMD_* 2019-08-03 19:48:02 +02:00
Victor
a0193fa903 Better warn user of hardcoded hitag info 2019-08-03 18:29:02 +01:00
iceman1001
52065adcfa chg: 'hf topaz reader' - more verbose 2019-08-02 11:37:35 -04:00
iceman1001
0747cf9ec0 add more keys (@anon) 2019-08-02 09:48:42 -04:00
Philippe Teuwen
ab74d2b798 Revert ARRAYLEN on whereami.c, bag of bones... 2019-08-02 08:06:30 +02:00
Philippe Teuwen
0eae1e2563 make style 2019-08-02 00:26:48 +02:00
Philippe Teuwen
865a7c3ad4 Add thinfilm simulation 2019-08-02 00:26:07 +02:00
Philippe Teuwen
824e0ae3e4 use thinfilm trace with hf thinfilm list 2019-08-01 20:15:46 +02:00
Philippe Teuwen
3bc5f7688d thinfilm trace 2019-08-01 20:06:07 +02:00
iceman1001
63a7f8a4c4 fix: 'hf topaz reader' - not crashing when trying to read a thinfilm 2019-08-01 12:36:50 -04:00
iceman1001
5a2d0c4cc1 chg: 'hf thinfilm info' - print text 2019-08-01 12:22:51 -04:00
iceman1001
2a054438ab chg: 'hf thinfilm info' - fixed manufacture lookup 2019-08-01 12:16:33 -04:00
Philippe Teuwen
7bdcf3cff5 thinfilm, show raw data if unknown encoding 2019-08-01 18:03:41 +02:00
Philippe Teuwen
85c0f3e9e3 thinfilm partial info when verbose 2019-08-01 17:49:35 +02:00
iceman1001
10c949a47e chg: 'hf thinfilm info' - versbose mode and sanity checks 2019-08-01 11:33:00 -04:00
iceman1001
2400418067 style 2019-08-01 11:15:39 -04:00
iceman1001
faf68081b0 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-08-01 11:11:07 -04:00
iceman1001
a331090c6a Chg : 'hf thinfilm info' - added crc check 2019-08-01 11:09:51 -04:00
Philippe Teuwen
8f6c048481 thinfilm: fix urls with 0xFE terminator 2019-08-01 17:07:07 +02:00
Philippe Teuwen
3fb442798d thinfilm usage typo 2019-08-01 15:49:58 +02:00
iceman1001
fbff51c88d Add: hf thinfilm info - support to read and decode Kovio Thinfilm NCT tags 2019-08-01 09:39:33 -04:00
Philippe Teuwen
733a7d836d more ARRAYLEN 2019-08-01 00:14:09 +02:00
Philippe Teuwen
f276dca3f1 less hardcoded sizes and more ARRAYLEN 2019-07-31 23:45:17 +02:00
iceman1001
74288ad128 chg: hf topaz - got some love 2019-07-31 15:43:00 -04:00
Philippe Teuwen
98624037ad hf mfu: please no extended ascii char 2019-07-31 12:43:15 +02:00
Philippe Teuwen
f0c939b1bc hf mfu: avoid hardcoded array size 2019-07-31 12:14:44 +02:00
Philippe Teuwen
5edd342d4c Add NTAG_I2C_1K support to hf mfu, thanks JP Szikora 2019-07-31 12:04:32 +02:00
iceman1001
4c9b95c216 chg: flash messge 2019-07-30 14:31:10 -04:00
iceman1001
6d1c996251 chg: flashing - test messages 2019-07-30 19:22:24 +02:00
netvader
8abbbe4d5e
Update default_keys.dic 
add hotel key from alltours
 2019-07-29 11:03:20 +02:00
Philippe Teuwen
c6b8e199fd fix usart cmd descriptions 2019-07-28 21:08:50 +02:00
Philippe Teuwen
c83ff9da0f make style 2019-07-28 19:24:00 +02:00
Philippe Teuwen
5854ab19dd client tells when over TCP 2019-07-28 19:23:37 +02:00
iceman1001
a25814bda4 ADD: 'trace list' - annotate nano signature 2019-07-28 14:23:30 +02:00
iceman1001
00350db238 Chg: hf tune - increase timeout vaules. fix #265 2019-07-28 03:29:31 -04:00
iceman1001
c5b8df449d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-07-28 09:22:30 +02:00
iceman1001
ca53711b8d chg: lf t55xx - helptext 2019-07-28 09:21:02 +02:00
iceman1001
9f4620c92c make style 2019-07-27 17:48:52 -04:00
iceman1001
f433e26e3b Add: 'hf mfu info' - now does orinality check against ECC. (@pwpivi) 
Adapted to prefered codestyle and added references.
 2019-07-27 23:44:23 +02:00
iceman1001
283060f962 chg: renaming a struct 2019-07-27 21:15:43 +02:00
iceman1001
e99910694b chg: some more key, thanks @Ollibolli 2019-07-27 15:06:58 +02:00
iceman1001
d7c967b65d chg: 'codestyle' 2019-07-27 10:25:03 +02:00
iceman1001
e9b493ead6 style 2019-07-27 02:39:30 -04:00
Iceman
b7ba46d38e
Merge pull request #292 from netvader/patch-1 
Update default_keys.dic
 2019-07-26 23:53:15 +02:00
netvader
54a18ebf2b
Update default_keys.dic 
added some keys from clever fit gym, hotel room turkey, and simonsvoss key card
 2019-07-26 22:45:16 +02:00
3ldidi94
ee152657c6
Add one more key 
Found a new key that is not in this dic file, so I add it.
 2019-07-26 11:43:21 +02:00
mwalker33
9085465c38 Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-25 21:00:41 +10:00
mwalker33
3211f35062 Added set default timings 2019-07-25 21:00:30 +10:00
mwalker33
b222161941
Merge branch 'master' into master 2019-07-25 20:12:00 +10:00
mwalker33
77d96ff3b7 Bug Fix Timing order 
Timing for backward compatibility
 2019-07-25 20:01:03 +10:00
Philippe Teuwen
c0eb19acb1 remove tabs 2019-07-24 00:52:24 +02:00
mwalker33
b16f2fdaba Merge branch 'master' of https://github.com/mwalker33/proxmark3-rrg 2019-07-24 08:15:38 +10:00
mwalker33
cdc3787008 clean 2019-07-24 08:12:25 +10:00
Philippe Teuwen
ab043a68b8 remove space in filename 2019-07-23 23:44:41 +02:00
Philippe Teuwen
ac233a346a make style 2019-07-23 23:43:30 +02:00
Philippe Teuwen
ac18114909 Remove long unsigned int warning 2019-07-23 22:46:58 +02:00
Philippe Teuwen
11e5131604
Merge pull request #284 from mwalker33/master 
T55x7 Downlink mode support added
 2019-07-23 22:42:47 +02:00
Philippe Teuwen
7e84a546c5 GetFromDevice leftovers 2019-07-23 21:45:06 +02:00
Philippe Teuwen
544fb30ce6 typos 2019-07-23 21:40:01 +02:00
Philippe Teuwen
9beabaabf5 make style 2019-07-23 21:33:52 +02:00
mwalker33
5de04f84e9 Restored * 8 
Revert back to store and use the full value (*8) for the timing.
 2019-07-23 20:12:05 +10:00
cjbrigato
70cd0d844b FIX : Tereifying typo 2019-07-23 07:39:34 +02:00
mwalker33
4e0e69ed63 Added T55 downlink mode support 2019-07-23 09:50:28 +10:00
cjbrigato
5c3676ad81 ADD: Early SPIFFS implementation see #257, UPDATE HF_COLIN accordingly 2019-07-22 22:56:06 +02:00
Philippe Teuwen
daae890667 Bootrom & flasher changes: 
* use macros for versions
* activate UNDERSTANDS_VERSION in bootrom
* fix missing break; bug in bootrom
* force flash_load to reject images > 256k if bootloader not up to date
* move logic from flasher to flash
 2019-07-20 10:48:40 +02:00
slurdge
68aa9d631d Flasher support for versionning 
Only bootrom with version > 1.0.0 will allow 512K writes
 2019-07-20 10:47:24 +02:00
Philippe Teuwen
8e6258936c make style 2019-07-19 13:18:35 +02:00
Philippe Teuwen
33f2cb0981 Rework flasher exit on error 2019-07-19 13:15:32 +02:00
Philippe Teuwen
f6f14f82d4 Add option -i to flasher to query Pm3 for its memory size, and some doc tuning 2019-07-19 13:02:12 +02:00
Philippe Teuwen
44278272a4 typo 2019-07-19 12:39:23 +02:00
slurdge
7bf3255a6c Flasher support for 512K flash 
A better way would be to cut the connecting function and flashing function and to move the whole mem computation to flash.c
Working flasher
 2019-07-19 12:35:04 +02:00
Philippe Teuwen
4e9e7d6da0 temporary fix to get Appveyor happy. Will need more tuning later. 2019-07-18 23:50:45 +02:00
Julien Piat
29f8bfb80c Update default_keys.dic with new keys from Scan Badge APK 2019-07-18 15:54:21 +02:00
Philippe Teuwen
259c730bb0 exit(EXIT_FAILURE) if a port was specified to the client and no pm3 is usable 2019-07-17 20:15:47 +02:00
merlokk
84022807a8 fix rare emv search behavior 2019-07-17 12:20:04 +03:00
merlokk
a6977860db fix emv search keep field bug 2019-07-17 11:27:05 +03:00
Oleg Moiseenko
d3b6a8e193
Merge pull request #253 from merlokk/emv_apdu 
Emv apdu
 2019-07-16 18:08:39 +03:00
merlokk
638d698445 make style 2019-07-16 18:05:36 +03:00
merlokk
5fd2a7613f add check 2019-07-16 18:05:23 +03:00
merlokk
e61a65fbe8 check PPSE instead of PSE and vice versa. I have one card with this strange behavior... 2019-07-16 17:15:32 +03:00
merlokk
a30c62137b use apduencode for emv commands 2019-07-16 17:04:54 +03:00
merlokk
bd8824a2f3 make style 2019-07-16 16:10:11 +03:00
merlokk
7726ec6000 move sAPDU 2019-07-16 16:05:47 +03:00
Philippe Teuwen
ed4289d462
Merge pull request #251 from merlokk/reorg_includes 
added PACKED attribute for structures and reorganize include folder
 2019-07-16 14:52:14 +02:00
merlokk
12c6b5cb20 add the definition of PACKED in its client/deprecated-hid-flasher/flasher/proxmark3.h 2019-07-16 15:25:48 +03:00
merlokk
20d13d5509 added PACKED attribute for structures and reorganize include folder 2019-07-16 14:50:38 +03:00
Philippe Teuwen
d8763509de Add 'hw standalone' to jump to standalone mode from command line or script 2019-07-15 22:31:19 +02:00
Oleg Moiseenko
ddd4601c1e
Merge branch 'master' into ext_apdu 2019-07-15 19:25:48 +03:00
merlokk
84c09ce881 added define PACKED 2019-07-15 19:21:19 +03:00
merlokk
d2a2acf69c make style 2019-07-15 19:12:01 +03:00
merlokk
df1dd71d14 apdu format and print works 2019-07-15 17:26:42 +03:00
Iceman
caceea24a4
Update default_keys.dic 2019-07-15 15:36:12 +02:00
Philippe Teuwen
0ea7fa7784 buggy 'mem read' removed, 'mem save' renamed 'mem dump', can now display too 2019-07-15 12:57:20 +02:00
Philippe Teuwen
31c3a15cd4 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  textual
  Changelog for PR #245, #246
  chg: 'script run read_pwd_mem' - now can correctly deal with more than 4096 bytes when printing mifare classic keys
  Fix. More flexible anti-collision frame check
  hf_mf_sim. Really tags not respond NACK on invalid authentication
 2019-07-15 00:31:46 +02:00
Philippe Teuwen
cad1d500ca add msleep command 2019-07-15 00:31:38 +02:00
Chris
859a5e80ce Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-07-14 22:52:50 +02:00
Chris
0a845df8c3 chg: 'script run read_pwd_mem' - now can correctly deal with more than 4096 bytes when printing mifare classic keys 2019-07-14 22:52:34 +02:00
Philippe Teuwen
383d3327be remove spurious changes in make style 2019-07-14 18:42:11 +02:00
merlokk
a9d15d85e6 sketch2 2019-07-14 15:14:54 +03:00
merlokk
51bcc80a2b small fix 2019-07-14 15:00:40 +03:00
merlokk
68bfbde185 CmdHF14AAPDU sketch 2019-07-14 14:59:59 +03:00
Philippe Teuwen
55602bf833 Fix few zelaous WARNING->ERR 2019-07-14 12:17:34 +02:00
Philippe Teuwen
8bf4b4ad97 Promote WARNING to ERR on some error msgs 2019-07-14 00:35:18 +02:00
Philippe Teuwen
bb3c5e364e remove perror 2019-07-14 00:30:57 +02:00
Eloff
735077f358 Does clear trace log only at first call 'hf mf chk', to save whole process history 2019-07-13 18:26:52 +03:00
Philippe Teuwen
b0dbbd3683 make style 2019-07-13 00:38:30 +02:00
merlokk
d94c74b24b make style 2019-07-12 13:58:38 +03:00
Philippe Teuwen
fec7d802b9 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  Update default_keys.dic with keys from an APK
 2019-07-11 13:54:48 +02:00
Philippe Teuwen
844d732297 Replace ukbhit by kbd_enter_pressed, not requiring tcgetattr: 
Note that it behaves differently now
* it looks for Enter key only, not any key
* it "eats" the input, no need for (void)getchar() after it
* it works the same no matter the value of ICANON
* the mingw version has been adapted to act the similarly

This should fix its usage on Android where tcgetattr always returns -1
 2019-07-11 13:01:34 +02:00
merlokk
4d8a411413 APDUEncode 2019-07-11 13:08:43 +03:00
3ldidi94
6f457873cc
Update default_keys.dic with keys from an APK 
Update the dic with keys from Android application "Scan Badge".
I did the diff between keys already present and keys from the application.
 2019-07-11 10:37:00 +02:00
Philippe Teuwen
73bbb2e9e8 Silent properly GCC format-truncation warnings in jansson 2019-07-10 22:32:55 +02:00
Philippe Teuwen
e53ac8b715 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  Fix compilation under MacOSX
 2019-07-10 21:49:54 +02:00
Philippe Teuwen
99d2ed224a Minor changes on bootloader chip info 2019-07-10 21:49:14 +02:00
slurdge
4727ab96d7 Dynamic report of the chipID for flashing purposes 2019-07-10 21:11:20 +02:00
Philippe Teuwen
5924847e0c
Merge pull request #234 from matrix/osx_makefiles 
Fix compilation under MacOSX
 2019-07-10 20:58:32 +02:00
Philippe Teuwen
fce082db56
Merge pull request #235 from matrix/osx_warnings 
Fix Clang warnings
 2019-07-10 20:50:29 +02:00
Philippe Teuwen
f466cbc8e1
Merge pull request #236 from matrix/emv_bug 
Fix EMV bug
 2019-07-10 20:40:09 +02:00
Gabriele Gristina
1740d43655 Fix EMV bug 2019-07-10 18:48:15 +02:00
Gabriele Gristina
fa2595a619 Fix Clang warnings 2019-07-10 18:46:30 +02:00
Gabriele Gristina
563050c8ba Fix compilation under MacOSX 2019-07-10 18:43:19 +02:00
merlokk
1169a6cf1b apdu rename and print 2019-07-10 19:21:54 +03:00
merlokk
16b6d7e529 apdu universal parser 2019-07-10 19:11:56 +03:00
Victor
cb45313981 Add hitag2 write password auth 2019-07-09 23:00:57 +01:00
slurdge
248b109c9a Check if bootloader segment is within bounds 2019-07-09 22:12:39 +02:00
t0m4
0a1b2698c9 Code review 2019-07-07 14:00:13 +02:00
t0m4
88df59722e Code cleaning 2019-07-07 12:10:51 +02:00
t0m4
95fd247e10 Add 'hf 15 csetuid' command to set UID on ISO15693 Magic tags 2019-07-07 10:52:00 +02:00
iceman1001
959a2a9c87 mysterious keys #issue 839 offical repo 2019-07-06 11:16:39 -04:00
Philippe Teuwen
e047d223e4 Fix #216: skip --as-needed linker options under MacOSX 2019-07-06 10:06:04 +02:00
Victor
773845f411 Print help if unknown arg for hitag reader/writer 2019-07-04 22:12:48 +01:00
Iceman
ae4c3374cb
Update default_keys.dic 
More keys from 6b6bafed54
 2019-07-04 12:33:01 +02:00
Slurdge
7205a910c5 Add compiler name in [CLIENT] section 2019-07-03 16:08:09 +02:00
Iceman
3938933c63
Update default_keys.dic 
from mct app pr.
 2019-06-28 15:50:19 +02:00
Philippe Teuwen
0eea50f5a0 Add support for compilation on RaspberryPiZero (armv6) 
More generally, add support for platforms with atomics, which not really linked to
architecture but compiler features. This may also help on some mips for example.
 2019-06-26 00:12:32 +02:00
iceman1001
c6d245b843 fix: syntax erros in luascripts 2019-06-23 08:13:17 -04:00
Jacopo Jannone
7e1d4a54ad Fix syntax errors with Calypso & 14443b Lua 2019-06-23 11:53:48 +02:00
iceman1001
7961ff982d unique and added some more keys from @korsehindi 2019-06-15 12:05:40 -04:00
iceman1001
f11500f60f revert and double check empty buffers 2019-06-13 15:13:41 -04:00
Philippe Teuwen
2382ad551b update msleep in deprecated-hid-flasher 2019-06-12 13:57:02 -07:00
Philippe Teuwen
1ebfa897c8 remove some cppcheck warnings 2019-06-12 06:41:23 -07:00
Iceman
cb07f2f807
Merge pull request #210 from javastraat/master 
<added keys for Transportes Insular La Palma (Public Transport)>
 2019-06-09 11:23:28 +02:00
iceman1001
db578e9f5f fix: read14a.lua - wrong call 2019-06-09 04:59:16 -04:00
Albert Einstein
b344e7c133 <added keys for Transportes Insular La Palma (Public Transport)> 2019-06-09 10:27:20 +02:00
iceman1001
e7d00dce83 chg: upgrade always possible 2019-06-08 15:26:05 -04:00
iceman1001
fd2ac38ac3 chg: lf em 4x05_info 2019-06-08 15:24:12 -04:00
iceman1001
a6fc729f22 style 2019-06-08 10:11:18 -04:00
iceman1001
7fd7b539be textual 2019-06-08 10:10:04 -04:00
iceman1001
d3f26fe7b7 style 2019-06-08 10:09:13 -04:00
Philippe Teuwen
a55e597e36 make style 2019-06-07 21:40:33 +02:00
Philippe Teuwen
f7dfd2a1f2 Fix arg names mismatches between decl & def 2019-06-07 21:26:03 +02:00
Philippe Teuwen
732bc766f9 Reduce some var scopes 2019-06-07 18:41:39 +02:00
Philippe Teuwen
7a06a77283 text of data setdebugmode 2019-06-06 11:34:33 +02:00
Philippe Teuwen
1a39ec3026 hf mf/mfu dbg => hw dbg 2019-06-06 11:31:47 +02:00
Philippe Teuwen
d7614684f8 Make sure standalone modes can be launched when connected on USB without client 2019-06-02 23:20:02 +02:00
Philippe Teuwen
742fe16830 Makefile verbose mode: make V=1 as for CMake 2019-06-02 16:04:35 +02:00
Philippe Teuwen
8c0cd4cfa2 Cleaner makefile execution, use 'make Q=' if you want to see full lines 2019-06-02 00:25:25 +02:00
Philippe Teuwen
9b668e3827 client Makefile doesn't depend on platform specs anymore 2019-06-01 01:03:34 +02:00
Philippe Teuwen
5e83fcbd58 client Makefile doesn't use PLATFORM_DEFS anymore 2019-06-01 00:59:11 +02:00
Philippe Teuwen
e98c4e246d rework standalone makefile 2019-06-01 00:23:38 +02:00
Philippe Teuwen
501919a34a flashmem: text 2019-05-31 23:08:27 +02:00
iceman1001
ecc62add26 fix return check 2019-05-31 14:07:07 -04:00
iceman1001
0a3791ea3a chg: 'lualibs - 14a minor adaptation 2019-05-31 19:10:01 +02:00
iceman1001
a8b09eba31 chg: 'hf mfu info' - typo 2019-05-31 19:06:22 +02:00
iceman1001
430742a3b6 chg: 'mem info - public key' 2019-05-31 11:25:49 +02:00
iceman1001
b378d373ad chg: USB doesnt need extra delay 2019-05-29 04:00:02 -04:00
iceman1001
d2fb18f648 chg: 'hf mf dump' - remove debug statements 2019-05-29 08:55:12 +02:00
iceman1001
cee2fc7a34 hf mf rdbl - uses NG 2019-05-28 13:20:56 -04:00
iceman1001
ffc24d672b keys 2019-05-28 13:18:33 -04:00
iceman1001
caee0a1f6a key 2019-05-28 08:00:33 -04:00
iceman1001
0004b1075e chg: lf cotag demod - adjusted error trigger 2019-05-28 05:23:48 -04:00
iceman1001
8ed6c18497 style 2019-05-28 05:22:38 -04:00
iceman1001
74fb740c21 fix: lf em 4x05 - use correct paritytest (@marshmellow)\nchg: lf em 4x05_read\n chg: lf em 4x05_write - uses NG 2019-05-28 05:15:12 -04:00
iceman1001
548d6429ed return codes 2019-05-27 09:15:53 -04:00
iceman1001
53f2058c7a chf: hf mf eget\nhf mf eset\nhf mf eclr - uses NG 2019-05-27 07:46:27 -04:00
iceman1001
58bed70ad0 chg: hf 14a sim - uses NG 2019-05-26 15:00:49 -04:00
iceman1001
b05796c7c4 chg: hf mf dbg\nchg: hf mf sim\nchg: hf 14a sim - uses NG 2019-05-26 13:42:27 -04:00
iceman1001
ade858b4f5 fix: script run read_pwd_mem - wrong offsets for -i/-t/-m 2019-05-25 15:56:56 -04:00
iceman1001
6df94abf71 textual 2019-05-25 13:32:54 -04:00
iceman1001
37c30c0395 fix: askdemod - enhances which solves some viking demod errors 2019-05-25 13:27:43 -04:00
iceman1001
abc66484e5 fix: 14a raw commands - running lua scripts works again for MIX/NG frames 2019-05-25 09:06:44 -04:00
iceman1001
2d972f8cb9 style 2019-05-24 10:31:31 -04:00
iceman1001
20b39d55f2 fix: lf presco - show helptexts again 2019-05-24 10:27:21 -04:00
iceman1001
10fc50aff8 fix: lf viking demod - works :) 2019-05-24 09:48:31 -04:00
iceman1001
0d1438d156 chg: lf psksim - uses NG 2019-05-24 09:11:30 -04:00
iceman1001
80a91eba11 chg: need to free some 2019-05-24 07:22:50 -04:00
iceman1001
e727fe5818 chf: lf asksim - uses NG 2019-05-24 07:06:08 -04:00
iceman1001
98b75e43a5 fix: lf t55xx wipe 2019-05-24 06:22:43 -04:00
iceman1001
d32c4d5267 chg: resized flashmem offset for dictionaries to fit 2019-05-23 18:50:24 -04:00
iceman1001
594398ef73 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-23 18:32:21 -04:00
iceman1001
9426f61922 chg: lf sim - free mem? 2019-05-23 18:32:17 -04:00
iceman1001
ed9a5e6d6f chg: textual 2019-05-23 18:31:56 -04:00
Iceman
16c99b9fac
Merge pull request #202 from javastraat/master 
modified help in hf mf fchk and chk & some extra keys
 2019-05-23 23:10:12 +02:00
iceman1001
1ca50fd3b2 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-23 17:07:18 -04:00
iceman1001
c13e2f09a1 chg: lf simfsk\nlf paradox sim\nlf awid sim\n\lf ioprox sim\nlf pyramid sim - NG 2019-05-23 17:07:12 -04:00
Albert Einstein
38d0b37e1e added keys 2019-05-23 21:08:52 +02:00
Albert Einstein
684e93d61a added keys 2019-05-23 21:06:15 +02:00
Albert Einstein
de694d7cca modified help in fchk and chk 2019-05-23 21:04:48 +02:00
Philippe Teuwen
fda181890c nested structs on the sender, for more lean packet size computation 2019-05-23 20:54:21 +02:00
iceman1001
263d662783 chg: lf fsksim - uses NG 2019-05-23 13:16:06 -04:00
iceman1001
0564931450 fix: lf sim - if called with empty graphbuffer all strange things happend, like turning on HF field 2019-05-23 10:51:19 -04:00
iceman1001
f8dbf6138a fix: lf sim - dont forget to PACK your structs on both sides\n chg: data convertbitstream - converts bit to max/min in order to facilitate demodulation of simulation data 2019-05-23 06:12:20 -04:00
iceman1001
78d7077f01 chg: more keys 2019-05-23 05:02:28 -04:00
Philippe Teuwen
e0c9e2b0d1 rework usart RX timings 2019-05-22 23:30:52 +02:00
iceman1001
794d109f30 chg: lf t55 - fixes / read block uses NG 2019-05-22 11:59:39 -04:00
iceman1001
150fc205b2 chg - returns 2019-05-22 10:10:48 -04:00
iceman1001
1e4f7b7f68 chg - returns 2019-05-22 10:07:27 -04:00
iceman1001
160110f56d chg - returns 2019-05-22 09:57:29 -04:00
iceman1001
8266514ef0 chg - returns 2019-05-22 09:53:10 -04:00
iceman1001
da2c8d0292 chg - returns 2019-05-22 09:48:57 -04:00
iceman1001
f8749c9ee9 chg - returns 2019-05-22 09:47:03 -04:00
iceman1001
09b66e500d chg - returns 2019-05-22 09:46:40 -04:00
iceman1001
66361ec6a3 chg - returns 2019-05-22 09:44:55 -04:00
iceman1001
e191dc777d chg - returns 2019-05-22 09:43:39 -04:00
iceman1001
24458e1392 chg: lf search - works again 2019-05-22 09:40:58 -04:00
iceman1001
461a90eeaf chg: lf em - and even more return codes 2019-05-22 09:28:12 -04:00
iceman1001
420ca1b235 more returns 2019-05-22 09:04:38 -04:00
iceman1001
486211599d chg: return codes 2019-05-22 08:57:08 -04:00
iceman1001
d546f39534 chg: cmdlft55xx return codes 2019-05-22 08:48:23 -04:00
iceman1001
9925159bcd chg: return codes 2019-05-22 08:33:33 -04:00
iceman1001
ad394a2d6b chg: lf em 410x_sim - reworked to NG\n chg: lf em 410x_demod - now can demod the simulation data. 2019-05-22 08:32:30 -04:00
iceman1001
750739efe4 chg: not fatal 2019-05-22 05:59:43 -04:00
iceman1001
69bab29834 chg: params 2019-05-22 05:58:16 -04:00
Philippe Teuwen
13b461cab2 usart txrx: wait reply depends on rx waittime 2019-05-22 00:06:51 +02:00
Philippe Teuwen
fe6cbfc8fd baudrates & btfactory 2019-05-20 21:37:50 +02:00
iceman1001
cbc42336d6 fix: lf nedap sim - error when adding parity 2019-05-20 15:24:47 -04:00
iceman1001
f0c173ccba style 2019-05-20 10:50:23 -04:00
iceman1001
178c922218 chg: lf read - now uses NG 2019-05-20 10:48:51 -04:00
iceman1001
ab8826fed8 chg: lf config - uses NG 2019-05-20 09:50:04 -04:00
iceman1001
d7f1ab2175 chg: lf cmdread - now uses NG 2019-05-20 09:15:45 -04:00
iceman1001
ce4198f5f2 new pwds - white cloner (mwalker) 2019-05-20 07:11:16 -04:00
iceman1001
983e63d82f hw commands - uses NG 2019-05-20 04:28:34 -04:00
Philippe Teuwen
f0ec37b742 fix hw connect parsing 2019-05-18 21:35:50 +02:00
iceman1001
d4ad0da335 textual, 2019-05-18 18:51:05 +02:00
Philippe Teuwen
413440fdab hw connect: detect invalid usages 2019-05-18 18:45:15 +02:00
Philippe Teuwen
e6d64df6d0 Fixing segfault 2019-05-18 18:41:24 +02:00
iceman1001
faf3a95a45 chg: 'hw connect' - new params. p <port> b <baudrate> 
a correct call is now

hw connect p com6 b 115200

This will set baudrate between Client and BT White Dongle.
 2019-05-18 18:06:14 +02:00
iceman1001
24a4d053b3 chg: prompt now shows which channel is used. 2019-05-18 18:02:30 +02:00
iceman1001
d5802ff766 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-18 17:59:48 +02:00
iceman1001
687f7f3697 consistent output 2019-05-18 17:56:03 +02:00
iceman1001
cba5d18124 use MIX 2019-05-18 17:55:11 +02:00
iceman1001
a4f4104075 textual 2019-05-18 17:53:08 +02:00
Philippe Teuwen
10dc959f34 btfactory: reset role as well 2019-05-18 17:47:29 +02:00
Philippe Teuwen
e9eb764358 Fix MCK in usart, our MCK is 16*12/2/2 2019-05-16 20:12:00 +02:00
Philippe Teuwen
b5e4a60a15 timeout reconfiguration: flag was never cleared and some more changes: 
* clear newtimeout_pending flag
* fix initial newtimeout_pending flag value on win32
* remove all _atomic as anyway a load+clear wouldn't be atomic and we're not in a critical situation: just one writer seldomly called on reconnect
* move new timeout poll to uart_recv for faster deployment
* remove redundant uart_reconfigure_timeouts(UART_FPC_CLIENT_RX_TIMEOUT_MS);
 2019-05-16 12:35:40 +02:00
iceman1001
9b85f80321 chg: the reconnect now works good on ubuntu and mingw (for me :)) 
chg: increased timeout for FPC from 170 -> 200.  Mingw seems slower.
 2019-05-16 08:02:56 +02:00
iceman1001
c125b3e9fe chg: less nesting 2019-05-16 07:33:02 +02:00
Philippe Teuwen
b4e8be82f4 remove spMutex, use atomic test&set instead 2019-05-16 00:29:30 +02:00
iceman1001
bfe2cff383 chg: hf mf nack - now uses NG 2019-05-15 07:47:46 -04:00
iceman1001
50c59fb6b2 chg: cident - uses NG 2019-05-15 07:03:19 -04:00
iceman1001
65ff4f0e92 chg: hf mf setmod - uses NG 2019-05-15 06:52:22 -04:00
iceman1001
0edf5500fe mix 2019-05-15 12:02:22 +02:00
iceman1001
0740d14faa chg: some unifiying return values 2019-05-15 10:24:06 +02:00
Philippe Teuwen
bc090857b8 text 2019-05-15 08:57:15 +02:00
iceman1001
1e31455474 textual 2019-05-15 02:18:23 -04:00
Philippe Teuwen
8401eb4e14 Add usart btfactory 2019-05-15 02:15:19 +02:00
iceman1001
586e2ebabd textual 2019-05-14 11:42:58 -04:00
iceman1001
36ecc4be97 style 2019-05-14 11:42:17 -04:00
Iceman
eef53a853a
Merge pull request #196 from mcd1992/guikeys 
Add clamp to PageDown case in plot GUI and updated changelog as requested in #195
 2019-05-14 17:38:35 +02:00
iceman1001
ace4798c4d Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-14 17:13:54 +02:00
iceman1001
8bfe669430 fix: 'script run legic' - at last, it now saves in EML and BIN format. 2019-05-14 17:13:29 +02:00
Aaron McDaniel
1186753bf6 Added clamp to PageDown case in plot GUI and updated changelog 2019-05-14 10:12:46 -05:00
Philippe Teuwen
1147c9faf8 Use ARRAYLEN 2019-05-14 12:51:45 +02:00
iceman1001
da09131aa3 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-14 12:37:02 +02:00
iceman1001
d792f015a2 fix: 'script run legic' - bytes was in string format, 2019-05-14 12:36:37 +02:00
Philippe Teuwen
62cf4ad8a7 fancy INPLACE 2019-05-14 12:35:25 +02:00
iceman1001
48c71aeef6 fix: 'script run legic' - also save as binary. https://github.com/RfidResearchGroup/proxmark3/issues/193 
if binary file exists,  it will try to increase filename counter to find a non-existing name.
 2019-05-14 11:54:25 +02:00
iceman1001
28398222e6 chg: 'hf tune' - now with prefix :) 2019-05-14 11:18:33 +02:00
Iceman
d4eb91fa43
Merge pull request #195 from mcd1992/guikeys 
Added paged moving to the plot GUI
 2019-05-14 11:18:00 +02:00
Philippe Teuwen
d535d5a378 hf tune: can be interrupted by keyboard 2019-05-14 08:40:22 +02:00
Philippe Teuwen
42d025d01a Slight rework of hw tune 2019-05-14 08:29:24 +02:00
Philippe Teuwen
c281f71f59 hf tune: group commands 2019-05-14 08:25:26 +02:00
mcd1992
528da6ec32 Added paged moving to the plot GUI 2019-05-13 19:39:27 -05:00
Philippe Teuwen
7ed7a9de40 Rework hf tune to make it synchronous (needed for rdv4) 2019-05-14 00:37:03 +02:00
Philippe Teuwen
995d782bb0 CMD_READER_HITAG requires always a hitag_data struct 
used as SendCommandMIX(CMD_READER_HITAG, RHT2F_UID_ONLY, 0, 0, NULL, 0);
sent to ReaderHitag((hitag_function)packet->oldarg[0], (hitag_data *)packet->data.asBytes);
void ReaderHitag(hitag_function htf, hitag_data *htd)
=> we should always send a hitag_data struct
 2019-05-13 23:15:07 +02:00
Philippe Teuwen
ff7cd9d84d CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES needs 6 bytes of data. 
used as SendCommandMIX(CMD_MIFARE_ACQUIRE_ENCRYPTED_NONCES, blockNo + keyType * 0x100, trgBlockNo + trgKeyType * 0x100, 4, NULL, 0);
sent to MifareAcquireEncryptedNonces(packet->oldarg[0], packet->oldarg[1], packet->oldarg[2], packet->data.asBytes);
void MifareAcquireEncryptedNonces(uint32_t arg0, uint32_t arg1, uint32_t flags, uint8_t *datain) {
  [...]
  uint64_t ui64Key = bytes_to_num(datain, 6);

=> we should always send 6 bytes for "bytes_to_num"
 2019-05-13 23:11:05 +02:00
Philippe Teuwen
e4f00c52da Fix #194 Graph window loops to end if you scroll left past 0 2019-05-13 20:34:02 +02:00
iceman1001
6a6902e57d chg: luascripts now uses t55xx write NG frame format 2019-05-13 16:51:26 +02:00
iceman1001
801cb95967 fix: 'lf t55xx write' - wrong bitshift 2019-05-13 13:36:54 +02:00
iceman1001
d2a4ade2af chg: lf t55xx write - now uses NG frames. 2019-05-13 13:23:53 +02:00
Philippe Teuwen
0e827b1083 Fix CMD_T55XX_WRITE_BLOCK expecting data and sending NULL 2019-05-13 12:21:09 +02:00
Philippe Teuwen
6caf571a44 NG->MIX for hitag cmds where the zeroes were actual args 2019-05-13 10:35:30 +02:00
Philippe Teuwen
4929b16bf9 style 2019-05-12 20:38:03 +02:00
Philippe Teuwen
a2c70e5481 Add .dic to gitattributes for LF, remove existing CR 2019-05-12 20:37:51 +02:00
Chris
41db59f028 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-12 18:45:13 +02:00
Chris
d44a5712a7 add: default key for library / parking 2019-05-12 18:43:20 +02:00
Philippe Teuwen
80a71c59d4
Merge pull request #186 from uhei/hexdump 
Cmdtrace: Show trace ouput in hexdump format
 2019-05-10 19:27:45 +02:00
Philippe Teuwen
b6b20e246c
Merge pull request #187 from uhei/macos-readline 
client/Makefile: use brew libreadline on macOS
 2019-05-10 19:07:03 +02:00
Philippe Teuwen
3412e9d8c5 Capabilities versionning, would also detect platform struct pack issues 2019-05-10 19:00:18 +02:00
Philippe Teuwen
5aed3e04c9
Merge pull request #190 from uhei/memcpy-bo 
client/comms.c: fix buffer overflow
 2019-05-10 18:47:39 +02:00
Uli Heilmeier
a1c24c6c7d Cmdtrace: Show trace ouput in hexdump format 
Adding option 'x' to show trace output for 14a in hexdump format.
This output can be imported into Wireshark using the 'Import from Hex Dump' option.
Encapsulation type should be set to 'ISO 14443' and Max Frame Length to 256.

Format defined at https://www.kaiser.cx/pcap-iso14443.html
 2019-05-10 16:03:39 +02:00
Uli Heilmeier
0119e13ff3 client/comms.c: fix buffer overflow 
Don't copy more bytes into pm3_capabilities as its size.

Fix: RfidResearchGroup/proxmark3#189
 2019-05-10 14:50:09 +02:00
Uli Heilmeier
94b782ee10 client/Makefile: use brew libreadline on macOS 
Make sure we use libreadline from brew and not the default macOS shipped one.
Otherwise compilation fails for undefined rl_event_hook
 2019-05-10 12:24:38 +02:00
Philippe Teuwen
39c7941930 style 2019-05-09 20:20:54 +02:00
Philippe Teuwen
2bee7e12f6 Fix hf mfu dump on ULC: UID in filename 2019-05-09 20:05:12 +02:00
Philippe Teuwen
7195ce9b27 remove iso15 getUID timeout msg 2019-05-09 13:25:14 +02:00
Philippe Teuwen
730927a81d NG->MIX for few cmds where the zeroes were actual args 
CMD_READER_ISO_14443a
CMD_EPA_PACE_REPLAY
CMD_TEST_HITAGS_TRACES
CMD_FELICA_COMMAND
 2019-05-09 12:33:17 +02:00
Philippe Teuwen
84f696451d units 2019-05-09 01:07:34 +02:00
Philippe Teuwen
2c10482279 all LF sim: client waits till button pressed 2019-05-09 00:08:59 +02:00
Philippe Teuwen
ddd62e2848 text 2019-05-08 22:45:20 +02:00
Philippe Teuwen
d088ed4232 fast mode on LF techs using t55xx write block 2019-05-08 22:43:35 +02:00
Philippe Teuwen
962f45e3e6 mf nested: remove compilation warning 2019-05-08 22:02:14 +02:00
Philippe Teuwen
77398550b0 fast mode on Mifare emulator upload 2019-05-08 21:54:15 +02:00
Philippe Teuwen
c72e74275d fast mode on epa pace replay 2019-05-08 20:13:07 +02:00
Philippe Teuwen
e7362d5e6a fast mode on legic cmds 2019-05-08 19:48:53 +02:00
Philippe Teuwen
93171e3d74 fast mode on sc upgrade, no much diff 2019-05-08 19:34:11 +02:00
Philippe Teuwen
2f71d951e1 iclass: avoid last ping in fast modes 2019-05-08 19:16:37 +02:00
Philippe Teuwen
2f2796be7e Fix deprecated-hid-flasher 2019-05-08 13:32:17 +02:00
Philippe Teuwen
4fd520c6d4 Introduce SendCommandBL 2019-05-08 13:31:58 +02:00
Philippe Teuwen
e93b4e3c61 Remove usb_cmd refs 2019-05-08 11:17:14 +02:00
Philippe Teuwen
c190ac0955 Hide conn error when hw reset, as suggested by @iceman 2019-05-08 11:14:29 +02:00
Philippe Teuwen
68e5b3c355 style 2019-05-08 01:35:51 +02:00
Philippe Teuwen
f49d7e6d39 remove SendCommand 2019-05-08 01:32:32 +02:00
Philippe Teuwen
c867b3bc9a Add cmd: usart btpin to change add-on BT PIN 2019-05-08 01:24:46 +02:00
Philippe Teuwen
df2203d9c3 hw command text 2019-05-08 00:58:36 +02:00
iceman1001
964006fd21 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-08 00:17:52 +02:00
iceman1001
01efa71e27 use NG 2019-05-08 00:10:03 +02:00
iceman1001
8ebd5e0579 textual, fixes to legic commands used. Needs testing 2019-05-08 00:07:20 +02:00
Philippe Teuwen
02ea378e38 Wow, two improbable bugs were cancelling each other 2019-05-08 00:02:08 +02:00
iceman1001
5b087a053c fix: script run legic_buffer2card - correct params for write command 2019-05-07 23:53:06 +02:00
iceman1001
a5f19cde79 textual 2019-05-07 23:46:37 +02:00
iceman1001
81feb56003 text 2019-05-07 23:44:46 +02:00
iceman1001
8548eda9bd Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-07 23:41:56 +02:00
iceman1001
d313804e78 textual 2019-05-07 23:41:41 +02:00
Philippe Teuwen
920affeb44 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  textual
  textual
 2019-05-07 23:39:47 +02:00
Philippe Teuwen
c505a59e3d Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  refactor NG
  refactor
  textual
  refactored NG
  textual
  refactoring NG
  refactoring
  15 - use NG and refactoring
  textual
  using MIX
  textual
  textual
  textual
  Update .gitignore
  chg: script run didump - helptexts
  fix:  rename to match the new file
  chg: script run didump - use MIX
  chg: hw ping - shouldnt be converted yet..
 2019-05-07 23:38:28 +02:00
iceman1001
9c95a2e8aa textual 2019-05-07 23:37:15 +02:00
Philippe Teuwen
2f1061f95b rework ping 2019-05-07 23:35:09 +02:00
iceman1001
89e25a4d1d textual 2019-05-07 23:34:05 +02:00
iceman1001
a59f2a1b60 refactor NG 2019-05-07 23:27:16 +02:00
iceman1001
e1bb05b35e refactor 2019-05-07 23:21:56 +02:00
iceman1001
7ccff2db4a textual 2019-05-07 23:19:22 +02:00
iceman1001
e799717880 refactored NG 2019-05-07 23:12:58 +02:00
iceman1001
6b472f6c56 textual 2019-05-07 23:04:29 +02:00
iceman1001
3c533db308 refactoring NG 2019-05-07 22:59:29 +02:00
iceman1001
9bf961cb8a refactoring 2019-05-07 22:48:18 +02:00
iceman1001
6fbd45aaed 15 - use NG and refactoring 2019-05-07 22:46:00 +02:00
iceman1001
b52a4a53b0 textual 2019-05-07 22:33:51 +02:00
iceman1001
b73146533a using MIX 2019-05-07 22:33:26 +02:00
iceman1001
c81bce6bf2 textual 2019-05-07 22:15:26 +02:00
iceman1001
2af7255f62 textual 2019-05-07 22:12:18 +02:00
iceman1001
75325aef86 textual 2019-05-07 22:08:46 +02:00
iceman1001
07b6535f7e chg: script run didump - helptexts 2019-05-07 22:03:11 +02:00
iceman1001
c99845b3d1 fix: rename to match the new file 2019-05-07 21:56:05 +02:00
iceman1001
df555be792 chg: script run didump - use MIX 2019-05-07 21:49:45 +02:00
iceman1001
c180c8df20 chg: hw ping - shouldnt be converted yet.. 2019-05-07 21:35:22 +02:00
Philippe Teuwen
bf0ab55833 text 2019-05-07 20:47:05 +02:00
Philippe Teuwen
532dbf28a1 let OpenPm be responsible of setting session.pm3_present 2019-05-07 20:37:23 +02:00
Philippe Teuwen
061321c353 flash still need old cmds 2019-05-07 20:13:01 +02:00
Philippe Teuwen
290f2b625b Automated upgrades SendCommandOLD/MIX 0,0,0,NULL,0 -> NG and SendCommandOLD ....,NULL,0 -> MIX 2019-05-07 19:51:33 +02:00
iceman1001
39272ba1fb convert sendOLD -> MIX for simple cmds 2019-05-07 19:13:14 +02:00
iceman1001
0c20c1a9d1 convert to MIX for simple send commands. 2019-05-07 19:03:25 +02:00
iceman1001
119b1e7c81 chg: mem commands - sendMIX 2019-05-07 18:50:45 +02:00
iceman1001
cb991b4d2c make sure CloseProxmark sets pm3_present. 2019-05-07 17:31:07 +02:00
iceman1001
7eb7685559 cleaning up, simplify 2019-05-07 15:57:22 +02:00
iceman1001
f2a954b422 chg: save serial port name as copy. 2019-05-07 15:40:01 +02:00
iceman1001
43db2a50e2 cleaning 2019-05-07 14:48:53 +02:00
iceman1001
f60977695a cleaning up 2019-05-07 14:41:20 +02:00
iceman1001
b91e21edde better output from setting prompt, cursor is still inside ... 2019-05-07 12:29:26 +02:00
iceman1001
f85280ad41 fix: 'hw connect' - if pm3 client was in offline more to start with, check.. 2019-05-07 12:28:17 +02:00
Philippe Teuwen
a20392edf3 change offline prompt asap 2019-05-07 12:18:51 +02:00
Philippe Teuwen
de54d35d5f unplug detection 2019-05-07 12:11:36 +02:00
iceman1001
f68a398e42 rename 2019-05-07 11:46:12 +02:00
iceman1001
bb19e42bbd textual 2019-05-07 11:44:29 +02:00
iceman1001
fb7445a027 chg: 'hw connect' - make port optional. Reused previous serial port 2019-05-07 11:42:36 +02:00
iceman1001
61d250a7f8 add: 'hw connect' - lets you connect to a specified serial port. If already connected, it disconnects current port before. 2019-05-07 11:05:05 +02:00
Philippe Teuwen
1c70163605 reconnect fast 2019-05-07 01:06:01 +02:00
Philippe Teuwen
ec5876ba35 Linux: Detect soon when pm3 is unplugged 2019-05-06 23:25:01 +02:00
iceman1001
fa8bd85016 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-05-06 22:42:01 +02:00
iceman1001
29a160c905 reconnect version2 yolo 2019-05-06 22:41:00 +02:00
iceman1001
52396e8b5a textual 2019-05-06 22:40:06 +02:00
Philippe Teuwen
c6b8c0c472 manual Makefile style (as some tabs need to be preserved) 2019-05-06 20:45:59 +02:00
iceman1001
dd82c42588 fix #185 - Only -mno-ms-bitfields on MINGW (@doegox) 2019-05-06 15:37:40 +02:00
iceman1001
3a902a7a4c chg: add some helptexts 2019-05-06 14:38:56 +02:00
iceman1001
cffd14a96b chg: reconnect to a disconnected proxmark3 device without restarting the client. Old functionality restored :) 
chg: renamed thread
chg: easier if-statements for USART
 2019-05-06 14:11:23 +02:00
Philippe Teuwen
eb7aa033ff Add fast mode support for RX NG frames 2019-05-05 22:34:22 +02:00
Philippe Teuwen
65bd945b54 style 2019-05-05 22:04:35 +02:00
iceman1001
71c37dcb04 alphabet order 2019-05-05 18:42:09 +02:00
Philippe Teuwen
6b5a0f8319 Rename and unguard CMD_DOWNLOAD_RAW_ADC_SAMPLES_125K ans it's used more generally than LF 2019-05-04 23:56:59 +02:00
Philippe Teuwen
ed1ff3db7e forgot 2 files in the merge :( my bad 2019-05-04 11:33:48 +02:00
Philippe Teuwen
1cff822f1e remove warning 2019-05-03 22:37:04 +02:00
Philippe Teuwen
3176684f4a Add usart dev cmds & dynamic flash support capability 2019-05-03 22:30:17 +02:00
iceman1001
8e2d5370f9 fix: seems the mutex messed up on ubuntu but there it works without. 2019-05-03 21:58:47 +02:00
iceman1001
a49ae2d0ce FIX: slow reconfigure on mingw of serial port 2019-05-03 21:33:00 +02:00
iceman1001
ed1950a0f5 fix: cross thread communictions of timeout variable 2019-05-03 17:53:32 +02:00
iceman1001
535559a140 textual 2019-05-03 11:25:55 +02:00
iceman1001
cb34e554fe chg: info log = yellow 2019-05-03 09:41:28 +02:00
Philippe Teuwen
b723126deb Make smartcard support detection dynamic 2019-05-03 09:04:28 +02:00
Philippe Teuwen
f33d0bf206 hw tune: block client till button pressed 2019-05-03 08:40:21 +02:00
Philippe Teuwen
2ec05efa3a remove outdated & unused loclass files 2019-05-02 12:24:00 +02:00
iceman1001
0cedfc7b2b chg: list should always be available, since we can now load / save trace files. 2019-05-02 10:42:02 +02:00
Philippe Teuwen
4e17b17343 remove snooper.c, outdated and we can do the same with pm3 client 2019-05-02 00:40:00 +02:00
Philippe Teuwen
e286b3091d remove cli.c, outdated and we can do the same with pm3 client 2019-05-02 00:34:55 +02:00
Philippe Teuwen
59cc7b46d4 emv: dynamic detection in client 2019-05-02 00:23:58 +02:00
Philippe Teuwen
f217b47cbd style 2019-05-02 00:18:20 +02:00
Philippe Teuwen
32bb9511ec Replace WITH_LF by dynamic detection in client 2019-05-02 00:02:38 +02:00
Philippe Teuwen
e6135a8f78 Replace WITH_ISO14443a by dynamic detection in client 2019-05-01 23:38:57 +02:00
Philippe Teuwen
d7b53aacee Replace WITH_HITAG by dynamic detection in client 2019-05-01 23:26:06 +02:00
Philippe Teuwen
78fdffddf7 Replace WITH_ICLASS by dynamic detection in client 2019-05-01 23:20:18 +02:00
Philippe Teuwen
c640c63e51 Replace WITH_FELICA by dynamic detection in client 2019-05-01 23:18:21 +02:00
Philippe Teuwen
745bff4143 Replace WITH_ISO14443b by dynamic detection in client 2019-05-01 23:17:14 +02:00
Philippe Teuwen
858def687a Replace WITH_LEGIC by dynamic detection in client 2019-05-01 23:14:30 +02:00
Philippe Teuwen
582d948ac2 Replace WITH_ISO15693 by dynamic detection in client 2019-05-01 23:04:50 +02:00
Philippe Teuwen
2d99c6096b fix IfPm3Fpc call 2019-05-01 23:04:20 +02:00
Philippe Teuwen
30d29434d5 Replace WITH_FPC by dynamic detection in client 2019-05-01 22:56:10 +02:00
Philippe Teuwen
bb966caab1 Replace WITH_LCD by dynamic detection in client 2019-05-01 22:47:21 +02:00
Philippe Teuwen
a79c792d9f Fix smartcard commands visibility 2019-05-01 22:37:47 +02:00
Philippe Teuwen
6b2677c154 Replace WITH_SMARTCARD by dynamic detection in client 2019-05-01 22:33:27 +02:00
Philippe Teuwen
cad676a23c Replace WITH_FLASH by dynamic detection in client 2019-05-01 21:46:29 +02:00
Uli Heilmeier
52179146b6 cmdparser: fix copy& paste typo 2019-05-01 21:31:34 +02:00
Philippe Teuwen
10489db97d capabilities: more IsAvailable helpers 2019-05-01 21:09:23 +02:00
Philippe Teuwen
ca43afa19b begin of dynamic capabilities handling in client 2019-05-01 20:48:15 +02:00
iceman1001
5a6929c533 chg: lua lib 14a, added disconnect support 2019-05-01 18:26:12 +02:00
iceman1001
ec5f70caf2 easier to read 2019-05-01 15:15:48 +02:00
Philippe Teuwen
645a4e9d1d generalize KEYS_IN_BLOCK usage 2019-05-01 14:55:14 +02:00
iceman1001
b7e3806eff chg: 'hf mf chk' - let eload part benefit for fast push mode 
chg: 'script run mfkeys' -  corrected to use NG frames correct
 2019-05-01 13:15:51 +02:00
Philippe Teuwen
13b2e6eed7 Fix hf mf chk 2019-05-01 12:19:51 +02:00
iceman1001
5ab9716e77 textual 2019-05-01 06:04:33 +02:00
iceman1001
63d67e2b0f fix: setting pm3_present in flasher. 2019-05-01 05:48:20 +02:00
Philippe Teuwen
4f11ef048f style 2019-05-01 01:38:52 +02:00
Philippe Teuwen
820a6d99a9 better offline mode 2019-04-30 23:52:40 +02:00
iceman1001
f8f39d6196 fix: passing a struct. 2019-04-30 22:03:20 +02:00
iceman1001
e6315b88a1 missing 2019-04-30 21:55:43 +02:00
Philippe Teuwen
63cd4a9fbb Merge branch 'better_color_handling' 
* better_color_handling:
  Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed
  Use PrintAndLogEx in flasher
  Simplify color & banner logic
  Smart color handling:
 2019-04-30 21:37:19 +02:00
Philippe Teuwen
27f7057961 Rename few USB -> PM3 to avoid misleading interpretations 2019-04-30 21:10:11 +02:00
Philippe Teuwen
a5d05e8d42 Remove cmd_debug from flasher, we've COMMS_DEBUG_RAW if needed 2019-04-30 20:23:22 +02:00
Philippe Teuwen
5c9c38ff71 Use PrintAndLogEx in flasher 2019-04-30 20:19:29 +02:00
iceman1001
cddc25994c fix: by reference 2019-04-30 16:16:17 +02:00
iceman1001
6cddaa0a08 fix: 'hf mf keybrute' - adapt to NG for checkkeys. Kind of out-of-datem, since hardnested solves this better. 2019-04-30 14:29:52 +02:00
iceman1001
2dea3684ae fix: 'hf iclass eload' - enable NG (Thanks @doegox) 
chg: 'hf iclass chk' - now uses fast push mode
 2019-04-30 14:19:26 +02:00
iceman1001
c1445d2a31 CHG: 'hf mf chk' - uses NG 2019-04-30 14:01:23 +02:00
iceman1001
937d839c6a chg: 'script run mfkeys' - use fast push mode. 2019-04-30 13:27:19 +02:00
Philippe Teuwen
0a4b90ac20 Simplify color & banner logic 2019-04-30 13:02:27 +02:00
iceman1001
e1063e2836 chg: reconfigure uart timeouts when compiled for FPC and connecting over USB. 2019-04-30 12:57:44 +02:00
iceman1001
481d70b0da chg: 'hf iclass eload' - use fast push mode. 2019-04-30 12:14:46 +02:00
iceman1001
918a46a984 uninit. 2019-04-30 12:12:55 +02:00
iceman1001
10ac5fd256 chg: 'lf sim' - now uses fast push mode 2019-04-30 10:10:25 +02:00
iceman1001
0ee710ed92 chg: lua scripts now get easy access to fast_push_mode option 2019-04-30 09:48:08 +02:00
Philippe Teuwen
a91d0a7b19 Smart color handling: 
* if on Windows, no color, as usual
* if on Linux, color only on real term
  * no color when > foo
  * no color in the logfile
 2019-04-30 00:41:52 +02:00
Philippe Teuwen
f4d62eec09 Fix COMMS_DEBUG_RAW 2019-04-29 23:02:49 +02:00
Philippe Teuwen
56f92348ea style 2019-04-29 22:41:28 +02:00
Philippe Teuwen
73b6fa7cbc Simpler newfilenamemcopy 2019-04-29 22:40:10 +02:00
Philippe Teuwen
35ea8e745e Faster CmdHF14AMfChk 2019-04-29 22:39:42 +02:00
Philippe Teuwen
32a512b13e Support break_after_ACK for MIX frames 2019-04-29 22:39:18 +02:00
Philippe Teuwen
ac9f3b29f6 better COMMS_DEBUG_RAW 2019-04-29 22:38:54 +02:00
Philippe Teuwen
fc6be9fea4 Define USB_CMD_DATA_SIZE_MIX 2019-04-29 22:38:26 +02:00
iceman1001
b08b1c2cd9 chg: 'hf mfu info' - ndef parsing was a bit wrong 2019-04-29 18:58:27 +02:00
iceman1001
31a531f1d0 chg: better ndef parsing and texts 2019-04-29 17:34:47 +02:00
iceman1001
9e34a8e56d chg: 'hf mfu info' - ndef has 4 byte blocks on UL/NTAG 2019-04-29 17:34:24 +02:00
iceman1001
60ea44069e text 2019-04-29 14:57:05 +02:00
iceman1001
c4e4e7dc69 text 2019-04-29 14:55:39 +02:00
iceman1001
50f5b1b422 intial 2019-04-29 14:49:18 +02:00
iceman1001
f4f61fecd6 chg: 'script run ndef_dump' - optional verbose ndefparsing 2019-04-29 14:47:44 +02:00
iceman1001
ea7ad8cbc6 fixes to ndef 2019-04-29 14:44:08 +02:00
iceman1001
f4b75d7f5b fix: ndef parse uri off by one 2019-04-29 14:42:37 +02:00
iceman1001
67e3ac3f54 add: ndef parsing to LUA 2019-04-29 14:19:41 +02:00
iceman1001
03d6454d95 chg: 'script run mfkeys' : uses NG 
chg: 'hf mf chk' : uses old/mix
 2019-04-29 12:12:14 +02:00
iceman1001
7454a4dcf2 chg: 'hf mf chkkeys' - now uses NG 2019-04-29 02:07:40 +02:00
iceman1001
7cc6975e52 fix 2019-04-29 01:52:55 +02:00
iceman1001
2b561ad732 next 2019-04-29 01:51:00 +02:00
iceman1001
47fbb557b4 next 2019-04-29 01:39:40 +02:00
iceman1001
b254e70160 next 2019-04-29 01:32:45 +02:00
Philippe Teuwen
5e8fc73527 Debug hexdumps of comm 2019-04-29 01:20:03 +02:00
iceman1001
805b679b2f fxing 2019-04-28 23:58:51 +02:00
iceman1001
a6ee9ef3e7 Merge branch 'experimental_varlen' of https://github.com/RfidResearchGroup/proxmark3 into experimental_varlen 
# Conflicts:
#	client/scripts/ndef_dump.lua
 2019-04-28 23:57:31 +02:00
iceman1001
9d512d411c chg: added manufacturer to 14ainfo structure. 
chg: ndefdump remakes
 2019-04-28 23:43:55 +02:00
Philippe Teuwen
69f8d81f4e style 2019-04-28 22:54:00 +02:00
Philippe Teuwen
f1deb865db Merge branch 'master' into experimental_varlen 
* master:
  ltrim cmd before display
  hf mf eload: fix absence of filename
  detect wrong numOfBlocks / numOfSectors arguments
  safeFile*: accept when suffix is already provided
  loadFile*: accept when suffix is already provided
  textual,  to reflect which repo.
  LoadEML: don't complain on the last \n
 2019-04-28 22:53:12 +02:00
Philippe Teuwen
5bc9118a19 baudrate only for physical uart 2019-04-28 22:51:40 +02:00
Philippe Teuwen
281cdead26 ltrim cmd before display 2019-04-28 22:38:44 +02:00
Philippe Teuwen
334e6d208b hf mf eload: fix absence of filename 2019-04-28 22:16:50 +02:00
Philippe Teuwen
997f5d700e detect wrong numOfBlocks / numOfSectors arguments 2019-04-28 21:34:05 +02:00
iceman1001
cf0d17853e next 2019-04-28 21:29:47 +02:00
Philippe Teuwen
1dbcb712c3 safeFile*: accept when suffix is already provided 2019-04-28 20:42:57 +02:00
iceman1001
f4f8636b86 more converting scripts 2019-04-28 19:51:25 +02:00
iceman1001
79bfe892d6 next 2019-04-28 19:45:00 +02:00
iceman1001
25dd7c9a1c spelling 2019-04-28 19:39:09 +02:00
iceman1001
02c2ea5a15 chg: next batch of scripts 2019-04-28 19:26:26 +02:00
Philippe Teuwen
405f24522e loadFile*: accept when suffix is already provided 2019-04-28 19:21:04 +02:00
iceman1001
819896acf6 first batch of updated scripts to use sendMIX commands instead. 2019-04-28 18:46:06 +02:00
Philippe Teuwen
c6172b4d9c LoadEML: don't complain on the last \n 2019-04-28 16:47:50 +02:00
iceman1001
195887487b fixes to commands.lua to support MIX/NG 2019-04-28 16:35:30 +02:00
iceman1001
292462fb74 fixes to sendMIX/SendNG 2019-04-28 16:31:49 +02:00
iceman1001
cc5b63823b chg: better sending 2019-04-28 12:52:25 +02:00
iceman1001
9779868753 style 2019-04-28 11:09:46 +02:00
iceman1001
abf93f4f2c Merge branch 'experimental_varlen' of https://github.com/RfidResearchGroup/proxmark3 into experimental_varlen 2019-04-28 11:05:51 +02:00
iceman1001
c13f9e7a0f add: SendCommandMIX, SendCommandOLD support in LUA 2019-04-28 11:05:23 +02:00
Philippe Teuwen
fbec3f3125 Merge branch 'master' into experimental_varlen 
* master:
  fix segfault
  rework shell scripts for easy client or flasher
  Stop poking Internet when compiling
  doc multiple commands with -c
  Add support for: proxmark3 -c "hw ping;hw version;hw ping"
  update.sh flash boot only if option -b
 2019-04-27 16:55:28 +02:00
Philippe Teuwen
8ebc44ee81 fix segfault 2019-04-27 16:52:23 +02:00
iceman1001
c5c364d994 fix: compilation on mingw 2019-04-27 11:57:11 +02:00
iceman1001
238eda8b17 chg: 'hw detectreader' cleanup 2019-04-27 11:07:59 +02:00
Philippe Teuwen
e2e0b704c5 Several changes in the initial connection, see details: 
* TestProxmark uses pingng
* New command CMD_CAPABILITIES to transmit capabilities from pm3 to host
* Use TestProxmark to retrieve capabilities with that new command
* CloseProxmark if TestProxmark fails
* Hide baudrate for USB and retrieve real baudrate from pm3 for BT
 2019-04-27 02:46:20 +02:00
Philippe Teuwen
7d1161d7d8 First packet is in TestProxmark, not pm3_version 2019-04-27 01:16:43 +02:00
Philippe Teuwen
12937884f6 move uart_speed to conn struct and display baudrate only for real UART 2019-04-27 01:15:52 +02:00
Philippe Teuwen
200290bc56 doc multiple commands with -c 2019-04-27 00:33:14 +02:00
Philippe Teuwen
d3cc0bb71c Add support for: proxmark3 -c "hw ping;hw version;hw ping" 2019-04-27 00:31:05 +02:00
Philippe Teuwen
e9bfc3eb7a Merge branch 'master' into experimental_varlen 
* master:
  rename usb_present
  TestProxmark only if OpenProxmark returned pm3 present
  Trying original SPI mode for 24MHz flash mem
  text
 2019-04-26 23:30:30 +02:00
Philippe Teuwen
897632a717 rename usb_present 2019-04-26 23:30:03 +02:00
Philippe Teuwen
4a576efc44 TestProxmark only if OpenProxmark returned pm3 present 2019-04-26 23:26:51 +02:00
Philippe Teuwen
3b6a249646 move global connection flags to cnn struct 2019-04-26 23:16:24 +02:00
Philippe Teuwen
01b31c742b Use block_after_ACK in flashmem too 2019-04-26 13:53:11 +02:00
Philippe Teuwen
b12be75a5b Remove block_after_ACK mechanism on NG frames, flashing uses OLD and NG won't use ACK anymore 2019-04-26 12:02:34 +02:00
Philippe Teuwen
a14b3d8b87 Merge branch 'master' into experimental_varlen 
* master:
  missing bracket
  text
  CHG: remove WITH_EMV since its not used at all.
 2019-04-26 10:54:12 +02:00
iceman1001
4ad9f57939 missing bracket 2019-04-26 10:49:30 +02:00
Philippe Teuwen
1c136c8fc6 Merge branch 'master' into experimental_varlen 
* master:
  rework Dbprintf & add color support
  use color macros
  doc magic
  archive and fix hid-flasher
  update standalone readme
 2019-04-26 10:48:28 +02:00
iceman1001
cf7e7d3447 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 10:36:26 +02:00
Philippe Teuwen
cb452c98ba rework Dbprintf & add color support 2019-04-26 10:36:06 +02:00
iceman1001
88744650db Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 08:56:16 +02:00
Philippe Teuwen
70995f0f1e use color macros 2019-04-26 08:29:48 +02:00
iceman1001
de05d6e4d2 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-26 00:30:36 +02:00
Philippe Teuwen
7d6f971db4 archive and fix hid-flasher 2019-04-26 00:11:45 +02:00
Philippe Teuwen
540fecb760 Merge branch 'master' into experimental_varlen 
* master:
  adjust standalone doc
  Use placeholder for standalone mode if needed
  Move compile options to Makefile.hal
  textual
  chg: refactor standalone mode info string add: icerun - skeleton standalone mode for ppl to use as base for their new modes.
 2019-04-25 23:01:49 +02:00
iceman1001
5c49fcbfdb CHG: remove WITH_EMV since its not used at all. 2019-04-25 22:51:01 +02:00
Philippe Teuwen
f3b3508d3e Move compile options to Makefile.hal 2019-04-25 22:15:16 +02:00
Philippe Teuwen
0fc79824dd Merge branch 'master' into experimental_varlen 
* master:
  remove redundant def
  chg:  forgot to readd hitag support :)
  Guard Hitag code
 2019-04-25 20:59:27 +02:00
Philippe Teuwen
a844afc273 Guard Hitag code 2019-04-25 20:42:41 +02:00
Philippe Teuwen
eababdd3ef Merge branch 'master' into experimental_varlen 
* master:
  chg: 'hf mf sim' - textual
  fix:  warning on mingw64.   This offset is calculated, casting it to u32 should be fine.
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 remove all offending code,  return 1.   Will only impact the speed of hardnested execution.
  fix again OSX
  fix https://github.com/RfidResearchGroup/proxmark3/issues/173
  used predefined constants, common types moved to common header files
  backward compatibility, on load converter for old mfu dump format
  loops for counters output
  UL/NTAG new dump file format. Added counters support, simulation
 2019-04-25 20:05:04 +02:00
iceman1001
df96b58fcc style 2019-04-25 17:06:40 +02:00
iceman1001
ef95d8c742 chg: 'hf mf sim' - textual 2019-04-25 16:57:18 +02:00
iceman1001
5cc3a1b717 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-25 16:55:48 +02:00
iceman1001
3bfd01bffb fix: warning on mingw64. This offset is calculated, casting it to u32 should be fine. 2019-04-25 16:55:00 +02:00
Iceman
f227041932
Merge pull request #172 from McEloff/hfmfu 
UL/NTAG new dump file format. Added counters support, simulation
 2019-04-25 16:10:03 +02:00
iceman1001
fe35a972f5 fix: https://github.com/RfidResearchGroup/proxmark3/issues/174 
remove all offending code,  return 1.   Will only impact the speed of hardnested execution.
 2019-04-25 16:08:08 +02:00
iceman1001
90463cb79f fix again OSX 2019-04-25 09:49:47 +02:00
iceman1001
ce8d5c66ab fix https://github.com/RfidResearchGroup/proxmark3/issues/173 
this seems to work for OSX,  and improved linux version with fallback.
 2019-04-25 08:29:15 +02:00
Philippe Teuwen
4b5800d78f remove name 2019-04-24 15:57:24 +02:00
Philippe Teuwen
517bf7e238 Merge branch 'master' into experimental_varlen 
* master:
  Force no-ms-bitfields to ensure proper struc packing on Windows
 2019-04-24 15:05:09 +02:00
Philippe Teuwen
1b246cd380 Force no-ms-bitfields to ensure proper struc packing on Windows 2019-04-24 15:04:43 +02:00
Philippe Teuwen
79d7fb65b5 Merge branch 'master' into experimental_varlen 
* master:
  Fix segfault when loading a file
  Revert c7a4d7af, remove redundant include
 2019-04-24 00:59:57 +02:00
Philippe Teuwen
25048ccf2f Fix segfault when loading a file 2019-04-24 00:53:25 +02:00
Philippe Teuwen
e453aff88c First adjustments for FPC BT link 2019-04-23 23:36:36 +02:00
Eloff
66ee8dc09e used predefined constants, common types moved to common header files 2019-04-23 21:14:20 +03:00
Eloff
a8c1fa7a3b backward compatibility, on load converter for old mfu dump format 2019-04-23 17:07:20 +03:00
Eloff
8793a9e596 Merge commit 'e171010d' into hfmfu 
# Conflicts:
#	CHANGELOG.md
 2019-04-22 23:26:20 +03:00
Eloff
4161779083 loops for counters output 2019-04-22 23:20:35 +03:00
Philippe Teuwen
9602e641e2 Merge branch 'master' into experimental_varlen 
* master:
  translation
  document offsets
  textual
  textual
  typo
  'hf mf sim' full-byte anti-collision frame support
 2019-04-22 21:39:38 +02:00
iceman1001
458ce75073 textual 2019-04-22 19:21:55 +02:00
iceman1001
166da51360 textual 2019-04-22 19:21:07 +02:00
Philippe Teuwen
d6892136ac Add communication_delay also to dl_it timeout 2019-04-22 02:44:06 +02:00
Philippe Teuwen
3e402797c1 dl_it uses also global start_time reset by packets reception as this can take ages (50s at 9600 baud for LF samples) 2019-04-22 02:11:46 +02:00
Philippe Teuwen
eebea8c088 DbpStringEx using reply_ng 2019-04-22 01:33:32 +02:00
Philippe Teuwen
913c03d3c4 Reset WaitForResponse timeout every time we get a packet 
as cmds sending a lot of Dbprintf msgs can take ages on slow links
e.g. "hw status" on 9600 baud link takes 26.5s with "reply_old" Dbprintf
 2019-04-21 23:56:08 +02:00
Philippe Teuwen
75ee60f267 WaitForResponseTimeoutW: fix, no communication_delay when timeout=-1 2019-04-21 23:26:51 +02:00
Eloff
db3103b531 UL/NTAG new dump file format. Added counters support, simulation 2019-04-21 03:18:00 +03:00
Philippe Teuwen
4aa1b49493 fix uart_posix: bytecound must be 32b 2019-04-21 01:05:02 +02:00
Philippe Teuwen
6e744043f5 usart working... when debugged... 2019-04-21 00:44:19 +02:00
Philippe Teuwen
a7773b3395 Introduce reply_mix, to still get some varlen on old API 2019-04-20 03:17:19 +02:00
Philippe Teuwen
3bcf80bb34 Introduce SendCommandMIX, to still get some varlen on old API 2019-04-20 02:41:40 +02:00
Philippe Teuwen
95822d8360 minor 2019-04-20 01:49:37 +02:00
Philippe Teuwen
238fc10c9a style 2019-04-20 01:08:07 +02:00
Philippe Teuwen
7331b7d6d2 Merge branch 'master' into experimental_varlen 
* master:
  Add ref to new mifaresim.h in standalone modes
  fix: Standalone/hf_colin now compiles
  Update readme.md
  chg: hitag compile flag optional
  fix: standalonemode matty_run now compiles
  typo
  smallfix
  chg: fpga lf simulation
  chg: 'fpga lf sim' - 25% both on sides.
 2019-04-19 23:17:36 +02:00
Philippe Teuwen
c4766b2649 Semi-Automated SendCommand -> SendCommandOLD 2019-04-19 23:01:13 +02:00
Eloff
52d1b7341f typo 2019-04-19 09:39:11 +03:00
Philippe Teuwen
128d90ca3c SendCommandOLD: hid-flasher 2019-04-19 02:10:52 +02:00
Philippe Teuwen
b68ccfa7b8 SendCommandOLD : comms & flash 2019-04-19 02:01:47 +02:00
Philippe Teuwen
2ac5482d9c SendCommandOLD & errors retval: mifarehost 2019-04-19 01:45:45 +02:00
Philippe Teuwen
45afe8dec0 errors retval for cmdemv 2019-04-19 01:14:58 +02:00
Philippe Teuwen
a6f52e839f fix bug 2019-04-19 01:14:04 +02:00
Philippe Teuwen
1b6a45ac17 propagate CmdsParse return value 2019-04-19 00:47:51 +02:00
Philippe Teuwen
38fc6e2290 errors: cmdmain 2019-04-19 00:42:25 +02:00
Philippe Teuwen
dcfee8963b SendCommandOLD & errors: cmdflashmem 2019-04-18 23:26:12 +02:00
Philippe Teuwen
7dbd12ad27 SendCommandOLD: cmdhw 2019-04-18 22:42:15 +02:00
Philippe Teuwen
9bd59a8d40 Add SendCommandOLD 2019-04-18 22:19:28 +02:00
Philippe Teuwen
b860cc6eaf Rename MAGIC defines 2019-04-18 21:49:37 +02:00
Philippe Teuwen
8c89b35f1e style 2019-04-18 21:41:48 +02:00
Philippe Teuwen
9ff841efb2 CRC optional, replaced by magic on USB 2019-04-18 21:39:35 +02:00
Eloff
960b21793c 'hf mf sim' full-byte anti-collision frame support 2019-04-18 21:02:48 +03:00
Philippe Teuwen
482db05741 Rename few stuff for consistency 2019-04-18 12:49:51 +02:00
Philippe Teuwen
0e855f647a typo 2019-04-18 10:45:24 +02:00
Oleg Moiseenko
1d60cf3bd6
Merge pull request #169 from merlokk/sf 
smallfix
 2019-04-18 11:26:21 +03:00
merlokk
8bf8f1735e smallfix 2019-04-18 11:25:57 +03:00
Philippe Teuwen
4e31c6110b Better Command structs 2019-04-18 00:12:52 +02:00
Philippe Teuwen
533667ea6d Better Reply structs 2019-04-17 23:44:48 +02:00
Philippe Teuwen
64eb93c9c4 style 2019-04-17 22:08:10 +02:00
Philippe Teuwen
7cbcf8163c Merge branch 'master' into experimental_varlen 
* master: (27 commits)
  textual
  style redundant assignment
  timeout fix
  small fix
  add termcap
  add readline and small fix
  rdp
  textual
  null term?
  fix: https://github.com/RfidResearchGroup/proxmark3/issues/166
  add dlls to release
  style
  style
  test fix
  test fixes
  another fix
  fix memleak
  fix
  textual
  use printandlogex
  ...
 2019-04-17 22:06:39 +02:00
Philippe Teuwen
be15ad7fec Viva la revolucion 2019-04-17 21:30:01 +02:00
iceman1001
587d826f84 textual 2019-04-17 20:36:10 +02:00
iceman1001
2783ba7583 style redundant assignment 2019-04-17 19:48:29 +02:00
iceman1001
b574db169e textual 2019-04-17 16:56:52 +02:00
iceman1001
853d2e14e6 null term? 2019-04-17 16:53:28 +02:00
iceman1001
ec7ab1a4ed fix: https://github.com/RfidResearchGroup/proxmark3/issues/166 2019-04-17 16:52:58 +02:00
iceman1001
3207aaea67 style 2019-04-17 14:57:21 +02:00
iceman1001
1ee3679a98 style 2019-04-17 14:54:42 +02:00
iceman1001
da2aa2c55f test fix 2019-04-17 14:50:07 +02:00
iceman1001
524346901a test fixes 2019-04-17 14:48:32 +02:00
iceman1001
e0bd6b2019 another fix 2019-04-17 14:39:47 +02:00
iceman1001
2044fd4130 fix memleak 2019-04-17 14:35:22 +02:00
iceman1001
f5b7371d7c fix 2019-04-17 14:33:09 +02:00
iceman1001
72f6ba712a textual 2019-04-17 14:01:05 +02:00
iceman1001
bc0e9687d7 use printandlogex 2019-04-17 13:45:55 +02:00
iceman1001
6930ca5785 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-04-17 12:01:33 +02:00
iceman1001
01b83482a7 use printandlogex 2019-04-17 11:58:44 +02:00
iceman1001
53b48ae6a9 use printandlogex 2019-04-17 11:55:52 +02:00
iceman1001
3fdac2577f use printandlogex 2019-04-17 11:54:40 +02:00
iceman1001
d89a5d0a5e use printandlongex 2019-04-17 11:48:17 +02:00
iceman1001
002e6b23fe Use printandlogex 2019-04-17 11:47:32 +02:00
Philippe Teuwen
8bfc5c1b47 New reply frames reception 2019-04-17 01:06:26 +02:00
Philippe Teuwen
96843c3f47 New reply frames transmission (reception still to be done) 2019-04-16 23:15:23 +02:00
Philippe Teuwen
4eaa2fc5aa move common util fcts to /common to avoid common files (e.g. crc) to depend on non-common files 2019-04-16 23:02:40 +02:00
Eloff
63f9f11066 'hf mf sim' bugs fix, RATS support, etc 2019-04-16 23:52:05 +03:00
Philippe Teuwen
8b99df9074 Merge branch 'master' into experimental_varlen2 
* master: (33 commits)
  unified Proxmark3 text
  removed
  more colors
  rearranged banner output and messages
  textual
  revert
  revert
  revert
  style spaces
  fix fake com port
  style
  style
  styles
  not null?
  style
  style
  style
  style
  style
  style
  ...
 2019-04-16 20:58:58 +02:00
Philippe Teuwen
83571f02a0 style 2019-04-16 20:49:32 +02:00
iceman1001
436910605b unified Proxmark3 text 2019-04-16 20:00:25 +02:00
Philippe Teuwen
44bbb7d2c7 new frame format, smaller and with crc. Some code simplified 2019-04-16 20:00:17 +02:00
iceman1001
33b4a32dfd removed 2019-04-16 19:06:18 +02:00
iceman1001
8657e17a0b more colors 2019-04-16 17:29:19 +02:00
iceman1001
2639de23c6 rearranged banner output and messages 2019-04-16 17:26:15 +02:00
iceman1001
74ece72b26 textual 2019-04-16 17:21:42 +02:00
iceman1001
aaedeafbb1 style spaces 2019-04-16 16:56:56 +02:00
iceman1001
d17191d0a4 style 2019-04-16 16:11:46 +02:00
iceman1001
c6aa14efb7 style 2019-04-16 16:07:25 +02:00
iceman1001
f50566225c styles 2019-04-16 16:02:03 +02:00
iceman1001
eae370fc3d not null? 2019-04-16 15:51:13 +02:00
iceman1001
a6f145bd1a style 2019-04-16 15:47:21 +02:00
iceman1001
d8f756fd14 style 2019-04-16 15:43:53 +02:00
iceman1001
7b30126371 style 2019-04-16 15:29:18 +02:00
iceman1001
1c4a7709da style 2019-04-16 15:27:25 +02:00
Philippe Teuwen
34467b7550 Variable length frames, part1: USB Host -> Pm3 2019-04-16 10:01:08 +02:00
merlokk
934fb42a95 Jablotron ID length fix 2019-04-15 18:04:12 +03:00
Philippe Teuwen
62f46d6544 Use PrintAndLogEx 2019-04-14 18:51:07 +02:00
Philippe Teuwen
9a7bba2438 Move UART open msg to avoid flood in wait mode 2019-04-14 18:49:19 +02:00
Philippe Teuwen
ba926a91e5 more yellow 2019-04-14 18:38:06 +02:00
Philippe Teuwen
04c0384d3e Testing pm3 communication 2019-04-14 17:25:17 +02:00
Philippe Teuwen
3cba736841 baudrate for usart: use define and limit to 115200 only for WITH_FPC_HOST 2019-04-14 14:42:03 +02:00
Philippe Teuwen
9676d788e0 style 2019-04-14 13:37:53 +02:00
Philippe Teuwen
681c8fd22a main: use proper executable name, especially for mingw 2019-04-14 13:35:52 +02:00
Philippe Teuwen
e708d86306 Rework command line options 2019-04-14 12:54:37 +02:00
iceman1001
d28fac3ef0 style 2019-04-14 11:43:05 +02:00
iceman1001
e9db49be1e chg: 'data rawdemod' - enhanced command params 2019-04-14 11:13:31 +02:00
iceman1001
dd404a67a1 Fix: USART - default speeds is lower (@ryan) 2019-04-14 11:09:31 +02:00
Philippe Teuwen
4763eb417a fix coverity warnings 2019-04-14 11:05:32 +02:00
iceman1001
0a9d2ca03d lets see if cexpf can be removed now. 2019-04-14 07:41:25 +02:00
Philippe Teuwen
8d94d2d67f comparison of integers of different signs [-Wsign-compare] 2019-04-14 00:45:27 +02:00
Philippe Teuwen
15f0fef555 Fix data shiftgraphzero corrupting end of GraphBuffer 2019-04-13 23:57:26 +02:00
Philippe Teuwen
993728072a comparison of integers of different signs [-Wsign-compare] 2019-04-13 23:55:58 +02:00
Philippe Teuwen
97676d3210 comparison of integers of different signs [-Wsign-compare] 2019-04-13 23:38:34 +02:00
Philippe Teuwen
ce606b51fc Handle explicitly enum vals in switch [-Wswitch-enum] 2019-04-13 22:46:08 +02:00
Philippe Teuwen
b6ee94ec8e style 2019-04-13 22:07:58 +02:00
Philippe Teuwen
5c55664fc5 use more static and fix [-Wmissing-prototypes] 2019-04-13 21:57:13 +02:00
iceman1001
4572acc1eb cleaning out the helptext 
mingw got some bad asciiarts
 2019-04-13 13:34:02 +02:00
iceman1001
e20a47478f comment away my playground 2019-04-13 03:07:53 +02:00
iceman1001
dae0016bb2 times times times 2019-04-13 03:01:31 +02:00
iceman1001
22f8440183 struct 2019-04-13 02:51:33 +02:00
iceman1001
0a8c303685 move defines 2019-04-13 02:49:15 +02:00
iceman1001
1cb83e78a5 localtime, gmtime replaced 2019-04-13 02:45:53 +02:00
iceman1001
361cd83fce gmtime_r 2019-04-13 02:41:46 +02:00
iceman1001
48e1a7648e posix 2001 2019-04-13 02:30:00 +02:00
iceman1001
ecf282a54c missing include 2019-04-13 02:18:49 +02:00
iceman1001
f05566c834 missing pointers.. 2019-04-13 02:16:22 +02:00
iceman1001
a27348c592 replaced with threadsafe strtok_r call 2019-04-13 02:13:23 +02:00
iceman1001
85b4463000 style 2019-04-13 02:10:44 +02:00
iceman1001
f8a533af5d style 2019-04-13 02:09:23 +02:00
iceman1001
4cadd8c2ee style 2019-04-13 02:04:40 +02:00
iceman1001
ef46e3af29 style 2019-04-13 01:47:10 +02:00
iceman1001
618e31e920 style 2019-04-13 01:46:10 +02:00
Philippe Teuwen
4f32655004 use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-13 00:25:43 +02:00
Philippe Teuwen
05374fce07 Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes] 2019-04-12 19:41:56 +02:00
Philippe Teuwen
65305f361f no comment :( 2019-04-12 15:12:01 +02:00
Philippe Teuwen
1cb2ae889c Avoid Coverity BAD_COMPARE, but honestly I don't get it at all... 
int readCOTAGUid(void) {
>>>     CID 337768:  Incorrect expression  (BAD_COMPARE)
>>>     This implicit conversion to a function pointer is suspicious: "CmdCOTAGRead > NULL".
130         return CmdCOTAGRead > 0;

This is just an int compared to zero, why it thinks it's a null pointer??
 2019-04-12 13:43:36 +02:00
iceman1001
e7f4f615c0 unified text 2019-04-12 10:55:09 +02:00
iceman1001
d8ab476022 fix: 'hf legic info' - unsegmented card now uses card size to calc remaining length. Also made the output at bit more clear and colorful 2019-04-12 10:20:53 +02:00
Philippe Teuwen
8aa5b42cdf Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-12 02:07:11 +02:00
Philippe Teuwen
f6a6ec8447 Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-12 01:55:25 +02:00
Philippe Teuwen
7d48ad19f9 Rework Cmd exposed API, use more static and fix [-Wmissing-prototypes], ongoing... 2019-04-12 01:00:54 +02:00
Philippe Teuwen
20393d71a8 hardnested_tables: add C99 flag in suggested compilation 2019-04-11 19:43:48 +02:00
iceman1001
6609db82ab textual 2019-04-11 17:20:08 +02:00
iceman1001
a872f04c1e textual 2019-04-11 17:19:48 +02:00
iceman1001
fb8d7c3efa textual 2019-04-11 17:18:17 +02:00
iceman1001
7547952a4d style 2019-04-11 07:40:50 +02:00
Iceman
7483e56249
Merge pull request #155 from davidbeauchamp/hid36bit 
Add 36bit HID format, extend calcWiegand() to include oem bits
 2019-04-11 07:33:12 +02:00
David Beauchamp
5317fa0277 Restore log level 2019-04-10 20:44:21 -04:00
David Beauchamp
8d479e3a68 Add 36bit HID format, extend calcWiegand() to include oem bits 2019-04-10 20:34:42 -04:00
Philippe Teuwen
2879599ac4 #ifndef on all header files 2019-04-11 01:16:25 +02:00
Philippe Teuwen
35e97ba96a static 2019-04-11 00:10:21 +02:00
Philippe Teuwen
6416de1a38 emv_tags [-Wmissing-field-initializers] 2019-04-10 23:13:00 +02:00
Philippe Teuwen
3cd047be5d oops typo 2019-04-10 22:47:18 +02:00
Philippe Teuwen
0fe323de80 asn1_tag: remove unused field and initialize the others [-Wmissing-field-initializers] 2019-04-10 22:33:12 +02:00
Philippe Teuwen
34aa860fbd more [-Wmissing-field-initializers] 2019-04-10 22:20:45 +02:00
Philippe Teuwen
919cfb5841 more [-Wmissing-field-initializers] 2019-04-10 15:01:19 +02:00
Philippe Teuwen
0ab6de64d4 structs: initializes explicitely all fields, so we can detect when we really forgot one [-Wmissing-field-initializers] 2019-04-10 13:59:00 +02:00
iceman1001
af3397bd19 chg: 'lf indala demod' - textual 2019-04-10 13:46:51 +02:00
iceman1001
097835e684 fix nedap clone helptext. all waiting for the nedap clone cmd ... 2019-04-10 13:32:35 +02:00
iceman1001
2c68edfad4 fix indala clone/demod helptext 2019-04-10 13:31:09 +02:00
Philippe Teuwen
0ce9e37fb7 Remove duplicate helptext 2019-04-10 13:17:38 +02:00
Philippe Teuwen
3d6d58aae5 internal help fcts -> static 2019-04-10 13:06:05 +02:00
Philippe Teuwen
cc0454d5d2 tag unused Cmd [-Wunused-parameter] 2019-04-10 12:23:40 +02:00
Philippe Teuwen
7f76fea21a good const, bad const, fixing -Wincompatible-pointer-types-discards-qualifiers 2019-04-10 10:21:42 +02:00
osboxes.org
e703dcb8ad style 2019-04-10 09:49:42 +02:00
osboxes.org
598d016477 style 2019-04-10 09:47:46 +02:00
osboxes.org
acf3920394 style 2019-04-10 09:47:36 +02:00
osboxes.org
ffd2c92584 style 2019-04-10 09:46:01 +02:00
osboxes.org
ba45da1c28 style 2019-04-10 09:38:33 +02:00
osboxes.org
827cd721fe style 2019-04-10 09:37:46 +02:00
osboxes.org
ad52243981 style 2019-04-10 09:36:23 +02:00
iceman1001
2b582c9bd0 unused 2019-04-10 09:00:38 +02:00
iceman1001
9c78f4d6d0 unused 2019-04-10 08:58:08 +02:00
iceman1001
84233a8f85 unused 2019-04-10 08:57:23 +02:00
iceman1001
0a43c80dff unused 2019-04-10 08:55:29 +02:00
iceman1001
d5dc1156e1 unused 2019-04-10 08:54:33 +02:00
iceman1001
1809d6c839 unused 2019-04-10 08:52:45 +02:00
Philippe Teuwen
6d0ee581fd ease hardnested_tables compilation, in case we figure out what to do with it some day 2019-04-09 22:50:04 +02:00
Philippe Teuwen
55ac61e145 remove redundant buffer init 2019-04-09 22:43:29 +02:00
Philippe Teuwen
28ca3e8c22 on prototypes, void means sth 2019-04-09 22:42:23 +02:00
iceman1001
9c74a96c9b unused 2019-04-09 21:40:25 +02:00
iceman1001
cf21db6f38 unused 2019-04-09 21:38:04 +02:00
iceman1001
c19b5977d4 unused 2019-04-09 21:36:52 +02:00
iceman1001
3f2d02b978 unused 2019-04-09 21:36:14 +02:00
Philippe Teuwen
2ebf940bf0 PrintAndLogEx: use const on char *fmt 2019-04-09 21:25:11 +02:00
Philippe Teuwen
a561370f8d more strncpy fix 2019-04-09 20:15:08 +02:00
Philippe Teuwen
df55154649 more 2019-04-09 20:08:35 +02:00
Philippe Teuwen
2f33682035 use sizeof 2019-04-09 20:05:27 +02:00
Philippe Teuwen
ff194eb861 CmdHF15Write: make sure truncated string is null-terminated 2019-04-09 20:02:41 +02:00
Philippe Teuwen
258332894b hardnested: get rid of shift by negative value 2019-04-09 17:49:02 +02:00
iceman1001
87660df8f2 fix: 'hf mf hardnested' - not verify key when reading nonce file 2019-04-09 17:14:47 +02:00
iceman1001
ac88c435f6 remove old iso14443crc.c, fully replaced by crc16.c functions. 2019-04-09 10:12:15 +02:00
Fl0-0
be90c76f47 Fix sizes for GCC 8.2 string truncation warnings 2019-04-09 09:45:06 +02:00
iceman1001
b0d627bae5 check returnvalue 2019-04-08 14:41:06 +02:00
iceman1001
678293913c ccc 2019-04-08 14:22:50 +02:00
iceman1001
726e02b900 color 2019-04-08 14:22:04 +02:00
iceman1001
98d8405830 wrong includes 2019-04-08 12:58:26 +02:00
iceman1001
493a26b93a updated 2019-04-08 12:47:34 +02:00
iceman1001
cd85c57e11 style 2019-04-08 12:38:32 +02:00
iceman1001
cfe793bd22 pointers 2019-04-08 12:29:49 +02:00
iceman1001
b7b7db8ca4 unshadow crc16 2019-04-08 10:45:55 +02:00
iceman1001
4843726d7e unshadow bs_ones, bs_zeros 2019-04-08 10:36:58 +02:00
iceman1001
0e05faaf0c styles 2019-04-08 10:33:06 +02:00
iceman1001
0b6dce3363 styles 2019-04-08 10:30:20 +02:00
iceman1001
29d73046cc unshadow clock, the mysterious one 2019-04-08 10:21:28 +02:00
iceman1001
2b3e5b7aac style 2019-04-08 10:19:01 +02:00
iceman1001
ebe98723d4 unshadow 2019-04-08 10:17:08 +02:00
iceman1001
21d88ae2c2 unshadow, multiple defines. 2019-04-08 10:16:57 +02:00
iceman1001
91e34643ab unshadow 2019-04-08 10:14:22 +02:00
iceman1001
7f0b1eacd1 unshadow 2019-04-08 10:13:15 +02:00
iceman1001
a1d9b574fd style 2019-04-08 10:11:57 +02:00
iceman1001
5e1c5f72e1 styles 2019-04-08 10:10:48 +02:00
iceman1001
dcb83d2962 styles 2019-04-08 10:01:57 +02:00
iceman1001
e1d56b5f94 unshadow 2019-04-08 09:50:06 +02:00
iceman1001
2fc54ca667 unshadow clock.. the mysterious variable 2019-04-08 09:42:27 +02:00
iceman1001
854536b155 unshadow 2019-04-08 09:39:05 +02:00
iceman1001
eadc980835 unshadow 2019-04-08 09:26:39 +02:00
iceman1001
55cbedc600 styles 2019-04-08 09:24:31 +02:00
iceman1001
21fd059dc2 unshadow 2019-04-08 09:08:03 +02:00
iceman1001
ec278e60cc unshadow 2019-04-08 08:34:40 +02:00
iceman1001
a2176b722d fix 2019-04-08 08:28:43 +02:00
iceman1001
1815376ef5 style 2019-04-08 08:26:30 +02:00
iceman1001
8f2983368c style 2019-04-08 08:26:18 +02:00
iceman1001
075ccebfd5 unshadow 2019-04-08 08:23:11 +02:00
iceman1001
9328a8efbb fix 2019-04-08 08:15:28 +02:00
iceman1001
8d2c02878b simpler branching 2019-04-08 08:11:18 +02:00
iceman1001
a89ae9cb35 check return value from zlib inflateInit2... 2019-04-08 08:08:47 +02:00
iceman1001
f6a80e0dc8 funcArgNamesDifferent 2019-04-07 20:34:42 +02:00
iceman1001
514611e885 fix 2019-04-07 20:24:13 +02:00
iceman1001
f1a01dcc7b fix 2019-04-07 20:22:24 +02:00
iceman1001
8aa5dec805 styles 2019-04-07 20:21:14 +02:00
iceman1001
e95955b793 shadowing 2019-04-07 20:17:59 +02:00
iceman1001
648706d691 shadowing 2019-04-07 20:13:30 +02:00
iceman1001
f27d618a08 shadowing 2019-04-07 20:12:24 +02:00
iceman1001
b37981df74 shadow 2019-04-07 20:08:53 +02:00
iceman1001
c4d88c239b style 2019-04-07 19:21:24 +02:00
iceman1001
b6345a5df7 style 2019-04-07 18:44:15 +02:00
iceman1001
98d24a4fe8 style 2019-04-07 18:42:47 +02:00
iceman1001
c881acd631 more 2019-04-07 18:35:01 +02:00
iceman1001
4c4471331b fix 2019-04-07 18:32:03 +02:00
iceman1001
27003904ce printandlogs.. 2019-04-07 18:12:58 +02:00
iceman1001
8d9bd81020 never used assignments 2019-04-07 16:49:22 +02:00
iceman1001
9eba3a849a shadowing 2019-04-07 16:34:21 +02:00
iceman1001
03b44b324b assign 2019-04-07 16:30:02 +02:00
iceman1001
0ffe2a4700 shadowing 2019-04-07 16:25:19 +02:00
iceman1001
c65d782d73 shadowing 2019-04-07 16:23:07 +02:00
iceman1001
7bf24a170f style 2019-04-07 15:22:01 +02:00
iceman1001
d8f539c217 style 2019-04-07 15:20:27 +02:00
iceman1001
0b455607a9 fsize can't be zero 2019-04-07 12:41:29 +02:00
iceman1001
69ba2d6a5b rename variables in order to prevent a popular usbcommand named as c. 2019-04-07 12:33:33 +02:00
iceman1001
a7dea8f1e7 overshadowed buf. 2019-04-07 12:30:25 +02:00
iceman1001
1273971991 more crc 2019-04-07 12:14:16 +02:00
iceman1001
8003d95be9 crc 2019-04-07 12:13:05 +02:00
Philippe Teuwen
b787ccf150 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 
* 'master' of github.com:RfidResearchGroup/proxmark3:
  more crc overshadow
 2019-04-07 12:11:07 +02:00
Philippe Teuwen
a7448f802f make style: don't indent preprocessor directives 2019-04-07 12:10:51 +02:00
iceman1001
a8ad793f7f more crc overshadow 2019-04-07 12:10:04 +02:00
iceman1001
c4920d7179 fix crc overshadowing 2019-04-07 12:07:50 +02:00
iceman1001
7a24d7fdb6 chg: 'lf indala demod' - texual 2019-04-07 08:52:10 +02:00
Philippe Teuwen
24acbf86eb arg names 2019-04-06 22:15:57 +02:00
Philippe Teuwen
7259a27f05 Change printT55xxBlock API 2019-04-06 22:04:02 +02:00
Philippe Teuwen
50e131f99b arg names 2019-04-06 21:59:34 +02:00
Philippe Teuwen
51d6fa13eb arg names 2019-04-06 21:46:00 +02:00
Philippe Teuwen
41f36ca20b make style 2019-04-06 19:09:01 +02:00
Philippe Teuwen
2603c8d0d1 Merge branch 'hf_mf_sim' of git://github.com/vratiskol/proxmark3 into vratiskol-hf_mf_sim 
* 'hf_mf_sim' of git://github.com/vratiskol/proxmark3:
  Astyle
  Verbose mode
  ReSync file
  Add Encrypted data test
  Mifare 10B UID
  cardAUTHKEY log
  Remove FLAG_RANDOM_NONCE
  Mifare Sim
  LogTrace
  Log Level
  Use Variable
  Add Variable for MAX_MIFARE_FRAME_SIZE
  Add Data Block debug
  Correct flags & test
  Correct return
  Revert "Merge branch 'master' into hf_mf_sim"
  Sync from Upstream
  Astyle update
  hf mf sim
 2019-04-06 19:06:16 +02:00
Philippe Teuwen
b666c27f3c
Merge branch 'master' into hf_mf_sim 2019-04-06 01:22:15 +02:00
Philippe Teuwen
98d9408746 make style 2019-04-06 00:52:55 +02:00
Philippe Teuwen
59d40068e2 style 2019-04-06 00:38:22 +02:00
vratiskol
2278d3372e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-06 00:33:10 +02:00
Philippe Teuwen
366c1ec901 style 2019-04-06 00:07:48 +02:00
Philippe Teuwen
9ff5a4e2fa style 2019-04-05 23:17:16 +02:00
Philippe Teuwen
84753b91c0 fix %u <> size_t compilation warning 2019-04-05 21:12:32 +02:00
Philippe Teuwen
841f20c5e5 test_t55x7 logs & stats 2019-04-05 19:34:05 +02:00
iceman1001
fa0a2914f6 style 2019-04-05 19:29:16 +02:00
iceman1001
4be92f129a style 2019-04-05 19:13:03 +02:00
iceman1001
ffdfe09659 style 2019-04-05 18:57:05 +02:00
iceman1001
d42b779cbe style 2019-04-05 18:55:31 +02:00
iceman1001
e7406de219 redundant. 2019-04-05 18:53:17 +02:00
iceman1001
ea5dddafef fix: invalidPrintfArg 2019-04-05 18:47:36 +02:00
iceman1001
82f4388abe style 2019-04-05 09:22:12 +02:00
iceman1001
6404c974b6 style 2019-04-05 09:20:37 +02:00
iceman1001
647dcc596f style 2019-04-05 09:18:52 +02:00
iceman1001
632e80e9b1 style 2019-04-05 09:16:01 +02:00
iceman1001
5b0eed26b5 style 2019-04-05 09:14:40 +02:00
iceman1001
774cbc5cb9 chg: 'script run test_t55x7' - better test loops 2019-04-05 08:58:12 +02:00
iceman1001
229452719a chg: compare with low case 2019-04-05 08:36:12 +02:00
iceman1001
a499e30608 chg: 'script run test_t55x7' - more modulations and better wipe card 2019-04-05 08:21:10 +02:00
iceman1001
1a565ae953 fix uninitialised 2019-04-05 07:39:07 +02:00
vratiskol
7f198192ec ReSync file 2019-04-05 04:09:20 +02:00
vratiskol
0578e19fba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-05 03:48:25 +02:00
iceman1001
ad97aa3d29 chg: 'hf iclass sim' - void*, should be uin8_t* 2019-04-05 00:08:36 +02:00
iceman1001
4326d05674 clarify 2019-04-04 23:48:00 +02:00
iceman1001
444c12717c clarify 2019-04-04 23:45:58 +02:00
iceman1001
4d18b5a11c fix: compare unsigned 2019-04-04 22:36:45 +02:00
iceman1001
d127c2294c fix: compare unsigned 2019-04-04 22:35:38 +02:00
iceman1001
419eef5a43 fix: duplicate break 2019-04-04 22:22:31 +02:00
iceman1001
7a152dc383 fix: duplicate break 2019-04-04 22:11:30 +02:00
iceman1001
0dc0a96b3c fix: duplicate break 2019-04-04 22:10:46 +02:00
iceman1001
ff25fc700e fix: duplicate break 2019-04-04 22:09:43 +02:00
iceman1001
cd78a0878b fix: duplicate breaks 2019-04-04 22:08:23 +02:00
iceman1001
116837e9a0 chg: 'lf t55xx info' - text layout 2019-04-04 20:06:15 +02:00
iceman1001
436b026b27 ADD: 'script run test_t55x7' - a script to do regression test for t55xx programming / proxmark3 capability to read/demodulate different t55x7 configurations 2019-04-04 07:21:58 +02:00
vratiskol
6e8b3c29ba Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 22:18:39 +02:00
iceman1001
38162917dc Add: new lua scripting support for some t55xx commands. 
core.t55xx_detect()    - same as 'lf t55xx detect'
  core.t55xx_readblock() - read t55xx block, don't forget to run detect before.  Returns actual blockdata.
 2019-04-03 19:48:00 +02:00
iceman1001
c03e425550 chg: 'hf 15 restore' - fail message added 2019-04-03 15:42:42 +02:00
iceman1001
0383d7f052 chg: 'hf mf restore' - add finish message 
chg: 'hf mfu restore' - add finish message
chg: 'hf 15 restore' - add finish message,  close filehandle when failing.
 2019-04-03 15:34:36 +02:00
vratiskol
1c77185fb9 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-04-03 01:48:46 +02:00
Philippe Teuwen
8c74b2f9da Remove compilation warning, even if it was not real issue 
cmdhflegic.c:269:13: warning: ‘strncpy’ output truncated before terminating nul copying 4 bytes from a string of the same length [-Wstringop-truncation]
 2019-04-02 22:48:22 +02:00
Philippe Teuwen
cbf81cf5c3 remove compilation warning 2019-04-02 22:43:00 +02:00
Philippe Teuwen
64ce30c06c make style 2019-04-02 22:32:45 +02:00
Philippe Teuwen
5225722a50 t55xx info: fix q5 condition 2019-04-02 22:08:50 +02:00
Philippe Teuwen
21be6d4400 FPC: got RX working, got client over usart somehow working..., see detailed commit msg 
* using WITH_FPC:
  * activate basic usart
  * no double buffer for now, no interrupt
  * usart_dataavailable/usart_readbuffer/usart_writebuffer, to demo it:
    * pm3 client over USB, minicom over usart
    * analyse a d 414243
* using WITH_FPC_HOST:
  * it implies WITH_FPC as it's based on it
  * control pm3 with client over usart
  * EXPERIMENTAL! still some frame desync issues
  * you can connect both from usart & USB with two pm3 clients
    * actually you *have* to connect USB for the moment because
      it's used to send debug messages about buggy usart... See Dbprintf_usb below
  * "sessions": msgs are directed to the latest client to have sent a cmd
  * Dbprintf_usb macro to send msgs to USB client to help debugging usart...
  * We now have an option to run client at different speed as usart is 115200:
    client/proxmark3 /dev/ttyUSB0 -b 115200
  * Consequently, argc,argv handling is a bit revamped, it was so messy...
  * USB and flashing are still at 460800, don't try flashing over usart yet ^^
 2019-04-02 22:06:10 +02:00
iceman1001
4c007beefd textual 2019-04-02 10:36:32 +02:00
iceman1001
4eff3521a7 Chg: 'lf t55xx info' - now prints if its a known config block 2019-04-02 10:33:25 +02:00
Philippe Teuwen
d448549524 t55xx info: tag out of spec FSKa modulations in standard mode 2019-03-31 21:30:30 +02:00
Philippe Teuwen
045eda93e9 t55xx config: allow to toggle on/off i/q5/st 2019-03-31 19:42:36 +02:00
Philippe Teuwen
e88fa75fd0 Revamped t55xx info: support offline block0, Q5, fix extended, add warns etc 2019-03-31 19:06:36 +02:00
Philippe Teuwen
43ca641939 Flasher: Avoid race condition when flasher finds the not yet closed pm3 port 2019-03-31 12:15:49 +02:00
Philippe Teuwen
2080dd396d t55xx detection: remove Atmel as it can be others, see t55xx trace for real manufacturer 2019-03-31 01:18:00 +01:00
Philippe Teuwen
720c410278 Fix lf t55xx trace: read the correct block 2019-03-31 01:13:59 +01:00
Philippe Teuwen
9cec581f1c Makefile: remove WINBINS/WINEXES, ProxSpace doesn't use them 2019-03-29 09:49:42 +01:00
Philippe Teuwen
db4aa08b78 make style 2019-03-28 14:19:41 +01:00
Philippe Teuwen
2ebada74f0 makefile: fix race condition, now we can make -j8 :) 2019-03-27 23:14:19 +01:00
iceman1001
5fd98db92d fix: LF FDX-B demod - more lenient with max errors. Thanks to @maltehillmann 2019-03-27 15:35:43 +01:00
vratiskol
a068f7c2bc Mifare Sim 
Compilation OK
Emulation 1k OK with android
 2019-03-27 14:18:26 +01:00
vratiskol
ee2dfc0852 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-27 08:00:35 +01:00
vratiskol
ffe4a0289f Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-26 22:28:20 +01:00
mazodude
15fdb07737 Start key file for Mifare Ultralight 2019-03-27 08:21:06 +11:00
iceman1001
069e73d025 preparing for more descramble patterns. 2019-03-26 21:13:57 +01:00
iceman1001
fb665ea7e3 chg: textual 2019-03-26 20:22:39 +01:00
iceman1001
34f4ee4902 whitespace 2019-03-26 20:22:12 +01:00
iceman1001
54e8eafa49 fix: 'lf t55xx chk' 
fix: 'lf t55xx brute'
fix: 'lf t55xx recoverpwd'
 - now works like they should again.
 2019-03-26 20:21:10 +01:00
iceman1001
834832be31 chg 'lf t55xx brute' - AquireData returns isnoise, but a pwd protected card signa looks like noise. 2019-03-26 16:23:19 +01:00
iceman1001
9133a9164f chg: 'lf t55xx chk' - refactored to use loadDictionary 2019-03-26 16:18:40 +01:00
vratiskol
60ac8b8934 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-26 10:08:49 +01:00
iceman1001
52be3f4fe5 chg: 'lf indala clone' - differnt input parms. '-L' gives a long UID. 
chg: 'lf indala demod' - tries to descramble parts,  and detection is changed.  Still issues with PSK2..
 2019-03-26 09:09:43 +01:00
vratiskol
04c14d1931 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-25 15:51:21 +01:00
iceman1001
68fc65a8c5 chg: 32bits binary strings used as default 2019-03-25 14:41:28 +01:00
iceman1001
6bc3ab1e44 chg: some pwd from forum 2019-03-25 14:39:49 +01:00
iceman1001
800bce865d fix: sprint_bin_break doesn't skip bits when newline printing 2019-03-25 14:39:09 +01:00
vratiskol
cffb8cbca4 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-25 00:16:40 +01:00
Philippe Teuwen
fe740fabfd cmdlfhid: comment unused struct 2019-03-25 00:04:28 +01:00
Philippe Teuwen
59cf25640f cmdhf14a: Fix usage of sizeof on a uint16_t array 2019-03-24 23:52:00 +01:00
Philippe Teuwen
7936626725 cmdanalyse: use byte arrays 2019-03-24 23:36:45 +01:00
vratiskol
0d5173739c Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-24 22:53:04 +01:00
Philippe Teuwen
9d1aa3fb96 fgpa_compress: dealloc responsibility to main and add missing one 2019-03-24 22:26:49 +01:00
Philippe Teuwen
eb3f5e12eb Fix memleak in fpga_compress 2019-03-24 22:20:58 +01:00
Philippe Teuwen
19588b045f Fix realloc mistake: ptr nulled but not freed upon failure 2019-03-24 22:09:25 +01:00
iceman1001
44c3a0a8aa chg: 'lf keri demod' - added stopbits 2019-03-24 19:50:53 +01:00
iceman1001
08dc8ab695 debug 2019-03-23 19:09:37 +01:00
iceman1001
cfb11adeb8 simple check 2019-03-23 19:08:22 +01:00
iceman1001
55b8b8df82 fix: 'lf pyramid demod' - inverted 
chg: checksum colors
 2019-03-23 19:06:52 +01:00
vratiskol
3b06c9d8ee Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-21 20:46:56 +01:00
iceman1001
ca9061bd32 changed byte_t -> uint8_t 2019-03-21 15:19:18 +01:00
vratiskol
e26677f841 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-21 14:45:08 +01:00
iceman1001
ffdd91cab6 add: 'hf 14a info' - uid changeable tests, finds two kinds of Gen2 / CUID. 4byte / 7byte but there other Gen2 cards which will not be detected by this. 2019-03-21 12:53:05 +01:00
vratiskol
f42dd2590e Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-20 23:42:00 +01:00
iceman1001
b111b37eb6 offline access 2019-03-20 22:05:29 +01:00
iceman1001
2534d02000 text 2019-03-20 22:04:35 +01:00
vratiskol
28d7b99e1b Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-20 15:59:11 +01:00
iceman1001
3c32fa9f38 color 2019-03-20 12:37:10 +01:00
vratiskol
cb895fb8ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 21:15:54 +01:00
iceman1001
8e465d076c chg: use found clock is common 2019-03-19 17:53:42 +01:00
vratiskol
49f0b35ffd Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 16:48:45 +01:00
iceman1001
ab226c2864 detectST has better clock detection. Since 'data raw am' fails but 'data detect a' succeed in finding a clock. Lets see if anything else breaks because of this? 2019-03-19 10:20:10 +01:00
vratiskol
1e20316cee Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-19 02:07:22 +01:00
iceman1001
f79c0075c4 style 2019-03-19 00:12:46 +01:00
iceman1001
e3dbbd3271 style 2019-03-19 00:11:32 +01:00
iceman1001
fb9d34447e style 2019-03-18 23:59:35 +01:00
iceman1001
690400d145 style 2019-03-18 23:57:44 +01:00
iceman1001
b7b7840ae1 bool 2019-03-18 23:57:00 +01:00
iceman1001
b8c5faee92 style 2019-03-18 23:55:53 +01:00
iceman1001
2276779b01 style 2019-03-18 23:55:39 +01:00
vratiskol
efa03a1e55 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 23:52:39 +01:00
iceman1001
122807148c style 2019-03-18 23:49:51 +01:00
iceman1001
26804cb85f style 2019-03-18 23:48:40 +01:00
iceman1001
fd198b0048 mem leaks 2019-03-18 23:46:26 +01:00
iceman1001
35592b979d unsigned long long 2019-03-18 23:43:44 +01:00
iceman1001
b57c2d5935 reverting.. 2019-03-18 23:31:04 +01:00
vratiskol
3c96440215 Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 22:49:42 +01:00
iceman1001
7344d9128f style 2019-03-18 22:35:33 +01:00
iceman1001
e26e666734 style 2019-03-18 22:31:31 +01:00
iceman1001
93a91454f9 style and fixes 2019-03-18 22:30:13 +01:00
vratiskol
c08c14656b Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 22:26:57 +01:00
iceman1001
17f5df152b style 2019-03-18 22:16:05 +01:00
iceman1001
b9cbc5cb7f bad logic 2019-03-18 22:14:07 +01:00
iceman1001
580159ed97 mem leak 2019-03-18 22:11:31 +01:00
iceman1001
4288e9db73 style 2019-03-18 22:04:53 +01:00
iceman1001
524ed17894 styles 2019-03-18 21:56:44 +01:00
iceman1001
38b24d94ba mem leaks 2019-03-18 21:53:57 +01:00
vratiskol
c2c4aac7ff Merge remote-tracking branch 'upstream/master' into hf_mf_sim 2019-03-18 21:51:29 +01:00
iceman1001
910b5f31c2 null terminated 2019-03-18 21:49:15 +01:00
iceman1001
1b48948486 clear 2019-03-18 21:45:06 +01:00
iceman1001
4fdbe9c3b2 chg: 'hf mf hard' - negativ comparison 
style
 2019-03-18 21:29:35 +01:00
iceman1001
aafa627095 style 2019-03-18 21:26:02 +01:00
iceman1001
52b90d3d6b bad comparission 2019-03-18 21:24:10 +01:00
iceman1001
dce51f34ed style 2019-03-18 21:21:15 +01:00
iceman1001
7deb99b999 realloc check? 2019-03-18 20:35:03 +01:00
iceman1001
20019b14ee style 2019-03-18 20:34:00 +01:00
iceman1001
5350f871ff style 2019-03-18 20:29:18 +01:00
iceman1001
4f88d7105f style 2019-03-18 20:24:09 +01:00
iceman1001
3727abd28c style 2019-03-18 20:17:24 +01:00
iceman1001
6889489555 uninit? 2019-03-18 20:02:00 +01:00
iceman1001
9e6b109856 string formatter 2019-03-18 20:01:17 +01:00
iceman1001
1d14c497b7 swapping order 2019-03-18 17:53:46 +01:00
iceman1001
cc9a99ed57 string formats 2019-03-18 17:46:52 +01:00
iceman1001
3e26b564cd nameing stuff 2019-03-18 17:42:49 +01:00
iceman1001
c8c9a69e3e unsigned value cant be less than zero 2019-03-18 16:59:21 +01:00
iceman1001
2a6be74fd1 fix: operations inside macro expansion 2019-03-18 16:57:41 +01:00
iceman1001
e92977f4bd Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-03-17 13:53:38 +01:00
iceman1001
c9cb16d428 fix: mfkey32, cut and paste error? 2019-03-17 13:51:47 +01:00
Iceman
9f9ee2f1fd
Update ntag_3d.lua 2019-03-16 11:22:36 +01:00
iceman1001
5583cfbc70 chg: 'lf search' - text 2019-03-16 11:07:49 +01:00
Philippe Teuwen
4632cc0203 typo 2019-03-16 10:50:01 +01:00
iceman1001
1fcd0f66c5 fix: null check 2019-03-16 07:31:13 +01:00
iceman1001
c83b2e7fff fix: null check 2019-03-16 07:31:00 +01:00
iceman1001
3efa05060e chg: update reveng v1.6.0 -> v1.6.2 2019-03-16 07:18:58 +01:00
Philippe Teuwen
a856ad638c Adjust mifare_autopwn to latest hf mf dump 2019-03-16 01:35:34 +01:00
Philippe Teuwen
f51e6fbad2 fix double free 2019-03-16 01:26:15 +01:00
iceman1001
35da3707d3 fix: 'hf iclass decrypt' - use after free 2019-03-15 22:07:21 +01:00
iceman1001
48a28fa575 fix: mem leaks 2019-03-15 22:05:36 +01:00
vratiskol
cfe2b2797e Revert "Merge branch 'master' into hf_mf_sim" 
This reverts commit cbea5d9d02, reversing
changes made to b66152feb2.
 2019-03-15 21:45:00 +01:00
vratiskol
cbea5d9d02 Merge branch 'master' into hf_mf_sim 2019-03-15 21:17:44 +01:00
vratiskol
6a52b6074f Sync from Upstream 2019-03-15 21:17:07 +01:00
vratiskol
64c3ae8b34 hf mf sim 2019-03-15 21:04:25 +01:00
iceman1001
f0d5b79abb chg: 'lf hitag reader' - more output 2019-03-15 20:10:17 +01:00
iceman1001
24df97b09b chg; remove compiler warning 2019-03-15 10:00:47 +01:00
Philippe Teuwen
2d2b128754 make style 2019-03-15 09:18:07 +01:00
iceman1001
b6f80e075b textual 2019-03-15 02:05:44 +01:00
iceman1001
e3127f7440 fix: 'hf 14b raw -t' - a bit messed up 2019-03-15 02:05:15 +01:00
iceman1001
c143f79e65 chg: 'sc upgrade' - verify firmware file integrity with sha512 validation (@piwi) 2019-03-15 01:54:43 +01:00
iceman1001
248135682c mix in proxmark code.. 2019-03-15 00:40:29 +01:00
iceman1001
bf99a181a8 free? 2019-03-15 00:32:50 +01:00
Philippe Teuwen
9b3cc10e0b fix Coverity string overflow 2019-03-15 00:27:26 +01:00
iceman1001
8f78c9d45e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-03-15 00:22:15 +01:00
iceman1001
f760677e32 overflow 2019-03-15 00:21:43 +01:00
Philippe Teuwen
b538a67ba3 make style 2019-03-15 00:20:42 +01:00
Philippe Teuwen
2f2dfd6239 remove debug line 2019-03-15 00:19:18 +01:00
Philippe Teuwen
f1a0e57f65 binarraytohex: handle Manchester wrong bit markers 2019-03-15 00:09:40 +01:00
iceman1001
da5ad8438c textual 2019-03-14 23:31:33 +01:00
iceman1001
5c3f12ee43 chg: 'lf hitag info' - added printing of configuration byte. (work-in-progress) 2019-03-14 23:30:45 +01:00
osboxes.org
9c2736d1eb spaces 2019-03-14 12:30:32 +01:00
iceman1001
71160ddbca fiddling 2019-03-14 11:34:32 +01:00
iceman1001
55f4942ab7 text 2019-03-14 11:30:49 +01:00
iceman1001
b65dc0a4c8 text 2019-03-14 11:29:50 +01:00
iceman1001
cbab48659e fix: 'lf hitag sim' - mem leaks 
fix: 'lf hitag cc' - mem leaks
 2019-03-14 11:20:44 +01:00
iceman1001
1f8040596f fix: 'hf 15 dump f' - now also selects card 2019-03-14 10:23:58 +01:00
iceman1001
e5a71fdd26 fix: 'hf iclass clone' - missing fclose 2019-03-14 10:01:07 +01:00
iceman1001
15020ffaa2 add: 'lf hitag info' - added a skeleton function. Needs to gather and print tag information. 2019-03-14 08:30:20 +01:00
iceman1001
7d88c22aaf chg: added limit check for loadfile 
rename: 'lf hitag checkchallenges'  ->  'lf hitag cc'
chg: 'lf hitag checkchallenges' - refactored, added helptext
 2019-03-14 08:24:49 +01:00
iceman1001
e4a9e348d6 chg: 'lf hitag list' - now uses the generic list. 2019-03-14 07:42:48 +01:00
iceman1001
2c44136913 chG: 'trace list hitag' - started to unify hitag2/S annotation 2019-03-13 23:05:45 +01:00
iceman1001
5608df9771 chg: refactored away hitag logtrace. 2019-03-13 22:48:51 +01:00
iceman1001
e3afad8758 CHG: 'lf hitag sim' - now loads from BIN/EML/JSON. Also merged it with 'lf hitag simS', which is removed. 2019-03-13 20:16:11 +01:00
iceman1001
072e83bc49 chg: 'lf hitag reader' - now support json format 2019-03-13 17:50:10 +01:00
iceman1001
b35ea2e352 chg: 'lf hitag writer' - refactored with timeouts etc. 
chg: 'lf hitag'  test without toggle mode enabled
 2019-03-13 16:44:32 +01:00
iceman1001
dda69c593a chg: 'lf hitag reader 21' - now save BIN/EML formats. 2019-03-13 16:31:34 +01:00
iceman1001
a117f06380 chg: refactoring of hitag (@piwi) 
chg:  refactoring of hitagS (@iceman)
 2019-03-13 12:18:37 +01:00
Philippe Teuwen
d9308d912d fix: shifting signed 32-bit value by 31 bits is undefined behaviour 2019-03-13 00:07:40 +01:00
Philippe Teuwen
98ff923d61 fix more strncat usage (one must specify available room, not total dest buffer size) 2019-03-12 22:06:37 +01:00
iceman1001
33f9af9619 chg 'data AutoCorrelate' - adjust the manual limit to 4% 2019-03-12 20:50:44 +01:00
iceman1001
1d63258388 add: 'hf 14b raw' - added -t timeout option. see https://github.com/RfidResearchGroup/proxmark3/issues/125 2019-03-12 14:41:23 +01:00
iceman1001
35bc4a975e rename SNOOP -> SNIFF 2019-03-12 13:15:39 +01:00
iceman1001
77693521df rename idteck 2019-03-12 12:56:59 +01:00
iceman1001
a35025f33f rename snoop -> sniff 2019-03-12 12:56:39 +01:00
Philippe Teuwen
1b2601a48a Add missing EOF LF 2019-03-12 00:12:26 +01:00
Philippe Teuwen
346af6e3d1 make style 2019-03-11 23:12:31 +01:00
merlokk
f24d7c4ba1 fix mfp wrbl command 2019-03-11 18:02:42 +02:00
iceman1001
fd642e8f51 adjustemnts 2019-03-11 15:08:34 +01:00
iceman1001
ff22f0ca7a rename: 
'lf snoop' -> 'lf sniff'
 'hf snoop' -> 'hf sniff'

As of now its gonna be called sniffing everywhere in the repo.
chg: 'lf search' textual
chg: 'hf search' textual
 2019-03-11 14:55:02 +01:00
iceman1001
eb906859b5 fix: 'lf ti demod' - hide debug messages 2019-03-11 07:38:20 +01:00
Philippe Teuwen
119e3f0ed9 Makefile: allow alternative platforms, try make PLATFORM=foo 2019-03-11 00:44:34 +01:00
iceman1001
7f26ed6e9f chg: 'lf hitag reader' - helptext 2019-03-10 14:44:21 +01:00
iceman1001
7921e363b0 output 2019-03-10 14:42:43 +01:00
Philippe Teuwen
73437dea62 Makefile: avoid compiling hardnested multiarch stuff systematically 2019-03-10 12:22:02 +01:00
Philippe Teuwen
21e6f2d861 jansson, tinycbor, mbedtls: avoid recompilations if not needed 2019-03-10 11:42:38 +01:00
Philippe Teuwen
2f12e57408 Makefiles: remove spurious spaces/tabs 2019-03-10 11:35:03 +01:00
Philippe Teuwen
961d929f4d changing {} style to match majority of previous style 2019-03-10 11:20:22 +01:00
Philippe Teuwen
da6cdf014b Keep string syntax in color macros 2019-03-10 00:56:00 +01:00
Philippe Teuwen
48124f89b4 fix ‘sprintf’ output between 15 and 19 bytes into a destination of size 18 2019-03-10 00:24:29 +01:00
Philippe Teuwen
22b43c65ec fix warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘size_t’ {aka ‘long unsigned int’} 2019-03-10 00:11:39 +01:00
Philippe Teuwen
554011f828 Fix warning: ‘strncpy’ output truncated before terminating nul copying as many bytes from a string as its length 2019-03-10 00:09:46 +01:00
Philippe Teuwen
0373696662 make style 2019-03-10 00:00:59 +01:00
Philippe Teuwen
0d9223a547 client: fix mix of spaces & tabs 2019-03-09 23:35:06 +01:00
iceman1001
112411042f cleaning up 2019-03-09 21:59:00 +01:00
iceman1001
38503b55d5 chg: cleanup 2019-03-09 21:43:03 +01:00
iceman1001
902a5f06ff chg: 'lf search' - added TI detection 2019-03-09 21:42:40 +01:00
iceman1001
e8d15d0c18 FIX: 'data load' - now loads large files again (TITEST.txt) 2019-03-09 20:47:57 +01:00
iceman1001
9ebf3f4f6d chg: use bool instead 2019-03-09 20:34:20 +01:00
iceman1001
89db6064d0 fix: 'lf paradox demod' - wrong check 2019-03-09 17:25:53 +01:00
iceman1001
6d364ec70d chg: 'data detectclocks' - skip if isnoise 2019-03-09 14:00:46 +01:00
iceman1001
aebfe193dc chg: 'data raw' - skip if signal is noise 2019-03-09 13:54:03 +01:00
iceman1001
45e8403d4d fix: 'lf t55' - aquiredata uses getsamples 2019-03-09 12:54:39 +01:00
iceman1001
cc81b5bed9 fix: tolower 2019-03-09 12:31:29 +01:00
iceman1001
6b9e5e0400 chg: unified code 2019-03-09 11:36:05 +01:00
iceman1001
d998602690 textual 2019-03-09 11:31:53 +01:00
iceman1001
cc9ec2d79c textual 2019-03-09 11:30:26 +01:00
iceman1001
e093d1ab29 Adds colors, etc 2019-03-09 11:29:34 +01:00
iceman1001
dc36bd5e5a fix: 'lf CheckChipType' - restores demodbuff/graphbuf properly 2019-03-09 11:13:46 +01:00
iceman1001
59eb83bf90 fix: use defines instead. 2019-03-09 11:10:54 +01:00
Philippe Teuwen
2d1a077ae4 lua: more fix mix of spaces & tabs 2019-03-09 10:40:45 +01:00
Philippe Teuwen
05ff45e550 lua: fix mix of spaces & tabs 2019-03-09 10:34:43 +01:00
Philippe Teuwen
bdd0494290 remove spurious spaces & tabs at end of lines: cpp files 2019-03-09 09:11:08 +01:00
Philippe Teuwen
60f292b18e remove spurious spaces & tabs at end of lines 2019-03-09 08:59:13 +01:00
Philippe Teuwen
edc19f202a Convert the few files with still Windows carriage returns 2019-03-09 08:49:41 +01:00
Philippe Teuwen
d8788bb376 appease coverity 2019-03-09 08:43:28 +01:00
Iceman
17435d366f
Merge pull request #122 from RfidResearchGroup/computeSignalProperties 
Replace isNoise by computeSignalProperties and removeSignalOffset
 2019-03-09 08:35:37 +01:00
iceman1001
810f92dbab FIX: 'lf visa read' - increase samples solves #123 2019-03-09 08:29:37 +01:00
iceman1001
1cf3e1b581 fix: 'lf visa' - use defines instead 2019-03-09 08:14:42 +01:00
Philippe Teuwen
1cba26decf remove redundant removeSignalOffset 2019-03-08 20:30:54 +01:00
Philippe Teuwen
ae719c3b05 Fix CmdT55xxBruteForce infinite loop 2019-03-08 20:10:16 +01:00
Philippe Teuwen
abddff513e loadFile: fix double free 2019-03-08 19:49:12 +01:00
Philippe Teuwen
4160e32b0a Replace isNoise by computeSignalProperties and removeSignalOffset 2019-03-08 19:06:55 +01:00
iceman1001
9764381aa4 fix: ndef - missing comma 2019-03-08 17:25:36 +01:00
Chris
2a761e80db chg: analyse nuid' - added colors 2019-03-07 19:48:20 +01:00
Philippe Teuwen
259a561a69 analyse nuid: better ref and selftest from ref + little fix 2019-03-07 15:55:53 +01:00
Philippe Teuwen
c5e1f9989c analyse nuid: fix crc -> selftest ok now 2019-03-06 20:16:12 +01:00
merlokk
cfcdbcdcee added some checks into madcheck 2019-03-06 00:50:12 +02:00
merlokk
05f5fb3e47 del verbose on warning 2019-03-06 00:43:59 +02:00
Philippe Teuwen
4dfcb727af cmds history: don't push to history if last command is replayed 2019-03-05 21:15:54 +01:00
Philippe Teuwen
581043bc90 Look for aidlist.json in the client dir 2019-03-05 20:33:18 +01:00
Oleg Moiseenko
8302751db7
Merge pull request #112 from merlokk/ndef_tlv 
Ndef reading for and mfp
 2019-03-05 19:58:28 +02:00
merlokk
2e8771d7a3 added hf mf ndef 2019-03-05 19:57:08 +02:00
merlokk
53e0d03098 ndef cert right decode. 
https://github.com/skjolber/ndef-tools-for-android/blob/master/ndeftools/src/org/ndeftools/wellknown/SignatureRecord.java
https://github.com/nfcpy/ndeflib/blob/master/src/ndef/signature.py
 2019-03-05 19:41:50 +02:00
merlokk
04a6a63427 rename 2019-03-05 18:43:12 +02:00
merlokk
581fe408ba ndef sig decoding 2019-03-05 18:14:30 +02:00
merlokk
a2be59db25 URI decode 2019-03-05 17:50:51 +02:00
merlokk
c7c97d35b5 some code to decoding payload 2019-03-05 17:25:11 +02:00
merlokk
7003783c08 refactoring 2019-03-05 16:43:13 +02:00
merlokk
fffa921aa0 ndef record decode OK 2019-03-05 16:41:20 +02:00
Iceman
5228cb5338
Merge pull request #110 from mazodude/master 
Delete MAD script as merlokk has implemented it
 2019-03-05 04:39:06 +01:00
merlokk
34a133451e small addon 2019-03-05 01:02:54 +02:00
merlokk
3bf618ca56 log structure 2019-03-05 00:54:45 +02:00
merlokk
64a5b355b5 added ndef record parse sketch 2019-03-05 00:51:32 +02:00
merlokk
a2f8f0628c added ndef tlv parsing 2019-03-05 00:48:02 +02:00
merlokk
0a30e03aaf add header 2019-03-05 00:13:01 +02:00
merlokk
cbe25f4832 add ndef.c/h 2019-03-05 00:11:31 +02:00
mazodude
760cd7b87c Delete MAD script as merlokk has implemented it 2019-03-05 08:36:04 +11:00
mazodude
fef7e78957 Merge remote-tracking branch 'upstream/master' 2019-03-05 08:35:03 +11:00
sh7d
59bae84531 Mifare mad - do not exit if checksum is shitty 2019-03-04 22:12:10 +01:00
Philippe Teuwen
0944a12744 Add missing header 2019-03-04 20:27:57 +01:00
merlokk
e191219d8a reading NDEF data from card 2019-03-04 20:22:25 +02:00
merlokk
54e8196774 hf mfp ndef sketch 2019-03-04 20:04:24 +02:00
merlokk
9c8e60cf03 added to hf mf mad 2019-03-04 19:44:19 +02:00
merlokk
f45c330843 small visual fixes 2019-03-04 19:25:13 +02:00
merlokk
2c07bb790c hf mfp mad read contents by aid 2019-03-04 19:18:44 +02:00
Chris
dcdb2ee218 fix: 'script run ndef_dump.lua' - move function 2019-03-01 19:24:02 +01:00
Chris
11f86c2d95 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-03-01 19:08:08 +01:00
merlokk
ee9daac029 Merge branch 'master' of github.com:merlokk/proxmark3i into mf_mad 
# Conflicts:
#	client/cmdhfmf.c
#	client/mifare/mifarehost.c
 2019-03-01 19:37:43 +02:00
merlokk
3a98c9fcd3 fix mad2 crc8 check 2019-03-01 19:13:59 +02:00
merlokk
979aa678ad small fix 2019-03-01 19:07:34 +02:00
merlokk
5cc4bea4e3 mfp refactoring 2019-03-01 19:05:51 +02:00
merlokk
6208a6869c added mad decode for mfp 2019-03-01 18:50:25 +02:00
merlokk
4d79ced1a9 ашчуы шт ьфвюс 2019-03-01 18:49:53 +02:00
Chris
ef2fc5b66c fix: 'hw tune' - reset demodplot line and grid clock 2019-03-01 12:09:35 +01:00
iceman1001
d73c501ffa another 2019-02-26 22:27:33 +01:00
Chris
8f05aa6fcf Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-02-25 22:34:30 +01:00
Chris
c2046f2e65 CHG: 'hf mf dump' - now saves in BIN/EML/JSON default 
CHG: 'hf mf esave' - now saves in BIN/EML/JSON default
 2019-02-25 22:33:49 +01:00
iceman1001
8c6312e209 fix mem leaks 2019-02-25 19:10:37 +01:00
iceman1001
972f8590e0 fix dereference 2019-02-25 19:10:00 +01:00
iceman1001
56a75fbf0b fix: bad division 2019-02-25 19:03:31 +01:00
iceman1001
d6bb8d630a fix: strings 2019-02-25 19:03:14 +01:00
3ldidi94
d929f31eb3
Update default_iclass_keys.dic 2019-02-25 18:52:44 +01:00
iceman1001
64bae8c8be fix: 'data detectclock' - now prints clock again... 2019-02-25 15:07:31 +01:00
Chris
711d384e7d chg: 'data autocorrelate g' - visual with gridclock patter and markup of two tops. Also added a "visual" inspection of peaks with 3% tolerance. This increases usability quite much. 2019-02-25 12:44:21 +01:00
iceman1001
a8eb0fd05f colors 2019-02-25 00:38:48 +01:00
iceman1001
a4ecc6d3ce colors 2019-02-25 00:32:59 +01:00
iceman1001
e3a0594b98 colors 2019-02-25 00:31:00 +01:00
iceman1001
7945b5a805 colors 2019-02-25 00:15:39 +01:00
iceman1001
ae4e3b72af chg: colors 2019-02-25 00:10:02 +01:00
iceman1001
bd26794c20 revert 2019-02-24 23:57:04 +01:00
iceman1001
2b9eb401fa fix: more checks 2019-02-24 23:54:36 +01:00
iceman1001
142b3d8de5 fix: assign 2019-02-24 23:54:24 +01:00
iceman1001
0803e532cc fix: 'hf felica list' - string overflows 2019-02-24 23:51:23 +01:00
iceman1001
3d84e4dc03 fix: dead code 2019-02-24 23:43:35 +01:00
iceman1001
2e3694aa3b fix: 'trace list' - missing break 2019-02-24 23:40:11 +01:00
iceman1001
34a17f842d fix 2019-02-24 22:34:14 +01:00
iceman1001
da9c662b23 text 2019-02-24 22:31:24 +01:00
iceman1001
157e08f51d fix: mem leaks 2019-02-24 22:17:36 +01:00
iceman1001
f59e67c00c fix: possible overrun 2019-02-24 21:42:30 +01:00
iceman1001
528e8fe395 fix: clock can't be zero or negative 2019-02-24 21:21:56 +01:00
iceman1001
a0e061fcd1 fix: rearrange it 2019-02-24 20:11:05 +01:00
iceman1001
17fcd8c24b fix: possible bad null ref 2019-02-24 20:00:41 +01:00
iceman1001
c650c23856 fix: 'lf flexdemod' - bad types 2019-02-24 19:57:57 +01:00
iceman1001
47c808fd5c fix: check return value 2019-02-24 19:50:24 +01:00
iceman1001
a49b3763dd fix: bad check 2019-02-24 19:50:05 +01:00
iceman1001
aaac99fdee fix: 'hf mf csave' unused code 2019-02-24 19:46:09 +01:00
iceman1001
f58c47a7b8 cleanup 2019-02-24 19:38:16 +01:00
iceman1001
01cf818e48 remove a warning 2019-02-24 19:32:14 +01:00
iceman1001
8e01c9899f aaaaaa 2019-02-24 18:31:59 +01:00
iceman1001
6b1ae818a5 fix: bad break.. 2019-02-24 18:27:56 +01:00