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

5374 commits

Author SHA1 Message Date
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