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

7109 commits

Author SHA1 Message Date
Philippe Teuwen 242c276bfb mfc mad_print compare 2020-06-09 18:45:37 +02:00
iceman1001 a93e54374e working case-insense 2020-06-09 17:52:32 +02:00
iceman1001 cb4369f3ec fix: hf mf mad - return value 2020-06-09 17:38:29 +02:00
iceman1001 a71f4cd475 fix coverity resource leak 2020-06-09 17:01:31 +02:00
iceman1001 17f56479ea fix coverity 2020-06-09 16:59:20 +02:00
iceman1001 5ada65bb20 textual 2020-06-09 16:46:46 +02:00
iceman1001 241309291b chg: hf iclass , use fileutils 2020-06-09 16:25:56 +02:00
iceman1001 33965f51d8 minor <> 2020-06-09 16:24:12 +02:00
iceman1001 e9fba19915 fileutils should be searching for json 2020-06-09 16:23:28 +02:00
iceman1001 76791bde0a textual 2020-06-09 16:22:35 +02:00
iceman1001 158251b2d9 look up mad directory json 2020-06-09 16:21:54 +02:00
iceman1001 bfc6a2c513 add: a MAD Directory in json 2020-06-09 13:31:09 +02:00
iceman1001 5b10df9b4c textual 2020-06-09 11:32:19 +02:00
iceman1001 d12606cb26 reverse crc check 2020-06-09 11:14:40 +02:00
Lukas Kuzmiak 3cbad6fa4c Merge remote-tracking branch 'public/master' into mifare-mad-fix 2020-06-09 02:06:27 -07:00
iceman1001 849be2376c textual 2020-06-09 09:19:25 +02:00
iceman1001 a0cbaee138 chg: mad makeover 2020-06-09 08:51:12 +02:00
Lukas Kuzmiak e3d16649b8 MAD application code & cluster code were swapped 2020-06-08 21:22:40 -07:00
Lukas Kuzmiak eb35636f49 remove duplicated key (first occurrence kept) 2020-06-08 17:26:03 -07:00
Philippe Teuwen de100fc8e7 Add SKIPPYTHON support to cmake 2020-06-09 00:47:34 +02:00
Philippe Teuwen 66505988a2 Add SKIPPTHREAD support to cmake 2020-06-09 00:39:35 +02:00
Philippe Teuwen 6358c07ec1 Add SKIPQT support to cmake 2020-06-09 00:34:41 +02:00
Philippe Teuwen 45b5bbed7b Add SKIPBT support to cmake 2020-06-09 00:27:50 +02:00
Philippe Teuwen c76b3061da Fix more deps/liblua Android cross-compilation 2020-06-08 20:20:16 +02:00
Philippe Teuwen 526407ed5c Fix deps/liblua Android cross-compilation 2020-06-08 19:18:08 +02:00
iceman1001 86c649f955 chg: "lf viking demod" - prepping for lib 2020-06-08 18:43:34 +02:00
iceman1001 618a945e55 fix missing semi 2020-06-08 13:19:01 +02:00
Philippe Teuwen 6894749978 Android: Fix bug introduced in e0371987ac 2020-06-08 12:44:14 +02:00
iceman1001 a7799a5bf8 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-06-08 09:23:16 +02:00
iceman1001 8f8d42652b remove dependency 2020-06-08 09:23:08 +02:00
Iceman e0371987ac
Update CMakeLists.txt 
We swapped from zlib to  bz2
 2020-06-08 09:11:13 +02:00
Philippe Teuwen 224cb2ffd7 make style 2020-06-08 03:15:10 +02:00
Philippe Teuwen 15012198f9 client: replace zlib by bzip2 2020-06-08 02:50:43 +02:00
iceman1001 93dbb24103 ftell return signed 2020-06-07 20:46:29 +02:00
iceman1001 d0b22cbd95 coverty 290397, 290399 2020-06-07 20:11:36 +02:00
iceman1001 307e39bb22 exposing function 2020-06-07 19:47:36 +02:00
iceman1001 8dd56a9004 fix resource leak 2020-06-07 19:29:14 +02:00
iceman1001 ae10e76cb5 fix resource leak 2020-06-07 19:25:56 +02:00
iceman1001 c84f81de76 chg: 'sc raw' - print response bytes 2020-06-06 23:32:09 +02:00
iceman1001 5bd300bb59 hint on failed serial port 2020-06-05 14:20:52 +02:00
Philippe Teuwen 8852e1f9cd Remove readline from libamiibo, no reason to be there 2020-06-05 13:13:27 +02:00
iceman1001 f354f480de chg; return codes 2020-06-05 11:05:46 +02:00
iceman1001 d2a499ce5e chg: 'trace save' - use .trace extension 2020-06-04 11:52:58 +02:00
iceman1001 fd93222fdb chg: 'trace save' - if client has no log, try download from device before saveing 2020-06-04 11:50:41 +02:00
iceman1001 66fd599c70 fix: 'hf mfu ndef' - now prints ID field correct if present 2020-06-04 11:32:33 +02:00
iceman1001 bbd9271fa3 chg: 'hf lto restore' - now uses save loads and case-ignore extensions 2020-06-03 17:28:29 +02:00
iceman1001 4ba4c76081 added a loadEML_safe fct 2020-06-03 17:27:38 +02:00
iceman1001 64322896f2 chg, textual 2020-06-03 15:31:41 +02:00
iceman1001 519d2e4917 fiddle 2020-06-03 15:27:22 +02:00
iceman1001 173f2d472d chg; remove unused fcts 2020-06-03 15:27:07 +02:00
iceman1001 dcdd9ce364 nothing special 2020-06-03 15:02:35 +02:00
iceman1001 d5731b3aec chg, strange wait 2020-06-03 14:52:48 +02:00
iceman1001 12425aaf60 chg, hf fido remake 2020-06-03 14:52:27 +02:00
iceman1001 17d6ce5007 coverity 290398 2020-06-03 14:26:09 +02:00
iceman1001 8898000dac chg: 'hf mfu restore' - now uses fileutils 2020-06-03 13:10:34 +02:00
iceman1001 e26f57628a Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-06-03 13:05:52 +02:00
iceman1001 f6566f89f2 chg: 'sc upgrade' - now uses fileutils 2020-06-03 13:05:33 +02:00
Philippe Teuwen 8667b34da6 document mingw tweak 2020-06-03 12:54:59 +02:00
iceman1001 843ab094bb chg: 'trace load' - use fileutils 2020-06-03 12:29:52 +02:00
iceman1001 4683f84991 chg: 'hf 15 restore' - now also can use addressed mode 2020-06-03 12:06:41 +02:00
iceman1001 cfa176dd3e frees 2020-06-03 11:18:17 +02:00
iceman1001 04bf1b8db7 cppchecker 2020-06-02 18:18:33 +02:00
iceman1001 653f5b4e5d chg: make define 2020-06-02 13:35:16 +02:00
iceman1001 7064b73b48 chg parsing free Thanks @doegox! 2020-06-02 13:27:54 +02:00
iceman1001 f830843442 coverity.. 2020-06-02 13:09:29 +02:00
iceman1001 295286e68a cppchecker 2020-06-02 13:02:21 +02:00
iceman1001 5c1b99b048 cppchecker 2020-06-02 13:01:11 +02:00
iceman1001 05c5179b41 cppchecker 2020-06-02 13:00:36 +02:00
iceman1001 cc6f497897 cppcheck 2020-06-02 12:56:38 +02:00
iceman1001 422e018718 cppcheck 2020-06-02 12:56:20 +02:00
iceman1001 c6072d7a45 chg, textual 2020-06-02 11:54:42 +02:00
iceman1001 f5efcc43f0 fix coverity 290111 2020-06-02 11:54:31 +02:00
iceman1001 96076c1945 chg: remove unused code from "hf mf sim" 2020-06-02 11:46:59 +02:00
iceman1001 2daa2c09fd fix coverity 290266 2020-06-02 11:27:47 +02:00
iceman1001 19f2c0ef89 fix coverity 290271 2020-06-02 11:09:10 +02:00
iceman1001 bd8edced9b fix coverity 290273 2020-06-02 11:07:29 +02:00
iceman1001 d8ef01b69d fix coverity 290272 2020-06-02 11:06:24 +02:00
iceman1001 c81f0c7d0f fix coverity 290270 2020-06-02 11:05:21 +02:00
iceman1001 cff9e2381d fix coverity 290268 2020-06-02 11:02:37 +02:00
iceman1001 e42e8e4c92 fix coverity 290267 2020-06-02 11:02:23 +02:00
iceman1001 fae2438559 fix cppcheck 2020-06-02 10:38:18 +02:00
iceman1001 d840084492 rearrange 2020-06-02 09:37:53 +02:00
iceman1001 8ed6afa99a fix cppcheck 2020-06-02 09:37:23 +02:00
iceman1001 5b1e16b14e cppcheck warning 2020-06-02 09:24:23 +02:00
iceman1001 c53c79f0ba fix coverity 290111 2020-06-02 09:18:45 +02:00
iceman1001 071ab7193c fix coverity 290110 - missing break 2020-06-02 09:17:10 +02:00
iceman1001 a62199ac0f fix: coverity 290109 resouce leak 2020-06-02 09:15:56 +02:00
iceman1001 c3ab0b6527 fix: #752 MINGW env needs to be using gnu printf 2020-06-02 08:54:59 +02:00
Philippe Teuwen aff86a2939 cleaner paths in cmake 2020-06-02 01:16:21 +02:00
Philippe Teuwen 72987d562f Implement real callbacks for load/save prefs 2020-06-02 00:52:00 +02:00
Philippe Teuwen 447105511a less global vars 2020-06-02 00:51:42 +02:00
Philippe Teuwen d234e2a8f5 less global vars 2020-06-02 00:51:32 +02:00
Philippe Teuwen b6077df68e less global vars 2020-06-02 00:51:21 +02:00
Philippe Teuwen b9b230bb99 cmdhfmfdes: remove global unused vars 2020-06-02 00:51:06 +02:00
Philippe Teuwen 6326c4126c cliparser: remove global vars 2020-06-02 00:49:54 +02:00
Philippe Teuwen ff1f945291 desfire_crypto: remove global vars 2020-06-02 00:49:54 +02:00
Philippe Teuwen e3eb8b7401 char* port for OpenProxmark and remove global gui_serial_port_name 2020-06-02 00:49:40 +02:00
iceman1001 f1da47336e fix: 'emv scan -w' - calculats hash correct 2020-05-29 12:42:52 +02:00
iceman1001 dc1bf1408a chg, printf 2020-05-29 10:34:28 +02:00
iceman1001 d65f2287f4 chg, output 2020-05-29 10:23:34 +02:00
iceman1001 529b33b234 chg, prints 2020-05-29 10:23:14 +02:00
iceman1001 54827d3ec9 chg, printf 2020-05-29 10:15:40 +02:00
iceman1001 fd6ac2f024 chg, emv print, styles, 2020-05-29 09:46:06 +02:00
iceman1001 7e70b53dd4 chg, scope 2020-05-29 09:28:09 +02:00
iceman1001 51e6440bed chg, printing style in emv 2020-05-29 09:27:58 +02:00
iceman1001 38a8e6021f fix, emv roca hash mismatch https://github.com/Proxmark/proxmark3/pull/781 (@pwpiwi) 2020-05-29 08:41:05 +02:00
iceman1001 691c1735a4 chg, printf 2020-05-29 08:39:13 +02:00
iceman1001 c3a706b8cf fix: 'lf ti demod - crc is now fixed 2020-05-28 10:16:22 +02:00
iceman1001 036544e49e fix another realloc 2020-05-27 23:26:57 +02:00
iceman1001 17c9bc8fc2 fix redundantassignment 2020-05-27 22:46:22 +02:00
iceman1001 2635ae43b7 fix redundantassignment 2020-05-27 22:43:48 +02:00
iceman1001 f61ca64681 fix clarify 2020-05-27 22:40:53 +02:00
iceman1001 9d355a9b4e fix out-of-bound 2020-05-27 22:36:14 +02:00
iceman1001 4073b88ed7 fix realloc properly 2020-05-27 22:33:50 +02:00
iceman1001 e7feadf32c fix out of bound 2020-05-27 22:33:16 +02:00
iceman1001 d0489da611 fix realloc properly 2020-05-27 20:53:04 +02:00
iceman1001 988b61cfa5 fix clarify condition 2020-05-27 20:41:55 +02:00
iceman1001 f6f9140c79 already empty 2020-05-27 20:26:52 +02:00
iceman1001 72170720fb fix memleak on realloc 2020-05-27 20:24:02 +02:00
iceman1001 49687f4749 fix clarify bool usage 2020-05-27 20:22:26 +02:00
iceman1001 12a4c5f202 fix clarify bool usage 2020-05-27 20:22:07 +02:00
iceman1001 dded3953ef fix memleak on realloc and uninit variable 2020-05-27 20:21:42 +02:00
iceman1001 f96361f8f1 fix memleak 2020-05-27 20:08:22 +02:00
iceman1001 a7260029be OLD->MIX 2020-05-27 17:53:02 +02:00
iceman1001 25890c3567 OLD->MIX 2020-05-27 17:49:18 +02:00
iceman1001 5860cb5e92 OLD->MIX 2020-05-27 17:48:02 +02:00
iceman1001 46f191e13f OLD->MIX 2020-05-27 17:46:50 +02:00
iceman1001 b42c5f59e1 OLD->MIX 2020-05-27 17:44:54 +02:00
iceman1001 54d3ea9c8f OLD->MIX 2020-05-27 12:02:59 +02:00
iceman1001 abff3c2ea1 OLD-MIX 2020-05-27 11:59:24 +02:00
iceman1001 f3cc84220f OLD->MIX 2020-05-27 11:58:04 +02:00
iceman1001 045f2a8587 OLD->MIX 2020-05-27 11:55:32 +02:00
iceman1001 f32620a04b OLD->MIX 2020-05-27 11:53:17 +02:00
iceman1001 fa2e952dc9 chg, swapped prefix for HINT 2020-05-27 10:19:45 +02:00
iceman1001 a8c3859ed1 chg, 'script run' - added hint 2020-05-27 10:19:22 +02:00
Philippe Teuwen fcfdd92407 python: adjust help, hide more if no python available, search lua/cmd/py if no extension given 2020-05-27 01:15:20 +02:00
Philippe Teuwen b4c715d8fb script run: look for all three extensions if not specified 2020-05-27 00:40:01 +02:00
Philippe Teuwen 24bdecac8e cmake: use less hardcoded items 2020-05-26 22:21:59 +02:00
Philippe Teuwen 02c76f39e2 fix cmake for osx+python 2020-05-26 22:20:34 +02:00
iceman1001 125e05ec0e chg, clean up 2020-05-26 21:58:50 +02:00
iceman1001 1781837bf9 chg, cmake for OSX, (Thanks @doegex!) 2020-05-26 21:57:26 +02:00
Philippe Teuwen 25c5eebfcf attempt to fix cmake+osx+python 2020-05-26 18:54:58 +02:00
Philippe Teuwen 8498c32a78 cmake support python < 3.8 and 3.8 2020-05-26 18:41:24 +02:00
Philippe Teuwen 0464fd476b Makefile python 2020-05-26 17:41:30 +02:00
iceman1001 176f0dfe75 chg, function available in v3.6 Travis has v3.5... 2020-05-26 17:35:27 +02:00
iceman1001 646a4cc4a6 more version info 2020-05-26 17:32:16 +02:00
iceman1001 9edb30f166 chg, python3-embed checks (@doegox) 2020-05-26 17:01:53 +02:00
iceman1001 feafa62ded chg, cmake compiles 2020-05-26 16:57:54 +02:00
iceman1001 e7230fa5d7 chg, cmake woodo. almost there 2020-05-26 16:47:54 +02:00
iceman1001 748c077268 chg, python3 in cmake? 2020-05-26 15:49:28 +02:00
iceman1001 698a56a919 moved and modified some existing pyton scripts for testing 2020-05-26 14:43:40 +02:00
iceman1001 f7537519ff chg, make python aware of pm3 search paths 2020-05-26 14:41:58 +02:00
iceman1001 3f02fa6e34 chg, right number of args.. 2020-05-26 13:37:28 +02:00
iceman1001 5fcb031a68 chg, python scripts can not have "exit" calls... 2020-05-26 13:10:33 +02:00
iceman1001 4aa4006167 chg, python should close the script file 2020-05-26 13:09:18 +02:00
iceman1001 366ac6a41f creating argc/argv 2020-05-26 12:35:26 +02:00
iceman1001 e106a5717c simple script working 2020-05-26 12:17:41 +02:00
iceman1001 6b8f1b141e change, search in python dir.. 2020-05-26 12:07:01 +02:00
iceman1001 6e3e1baef7 logsss 2020-05-26 12:00:42 +02:00
iceman1001 f852bf41c3 adapt to optional python, Thanks @doegox! 2020-05-26 11:49:26 +02:00
iceman1001 0e57a1c6cd optional python.. Thanks @doegox! 2020-05-26 11:48:37 +02:00
iceman1001 06927f983a added python3 as script engine, if installed on system 2020-05-26 11:30:17 +02:00
iceman1001 26e8a5a1e0 added check for systemlib python3 in makefile 2020-05-26 11:29:44 +02:00
iceman1001 e95f807251 sign-compare 2020-05-26 10:59:12 +02:00
iceman1001 b3ff89e41e sign-compare 2020-05-26 10:57:11 +02:00
Philippe Teuwen 162b7b58df Makefile: more info 2020-05-25 13:28:08 +02:00
Philippe Teuwen fc2ff7bb0a Makefile: remove /usr/local/lib 2020-05-25 13:05:44 +02:00
Philippe Teuwen 68da06f721 makefile reorder 2020-05-25 10:15:51 +02:00
Philippe Teuwen 79f3cec717 use system zlib if available (client only) 2020-05-25 02:44:12 +02:00
Philippe Teuwen b4716f78a8 remove unused polarssl file 2020-05-25 02:18:16 +02:00
Philippe Teuwen 72acec5806 Makefile & CMake rework 2020-05-25 02:15:06 +02:00
Philippe Teuwen 9d97962759 use system jansson if available 2020-05-24 23:21:30 +02:00
Philippe Teuwen 0653feaec8 Use system whereami if available 2020-05-24 20:37:40 +02:00
iceman1001 bde4198184 fix hf mfu 2020-05-24 12:51:51 +02:00
iceman1001 e7585b5944 fix #747, 'hf mfu eload' - now detects and converts between plain/old/new mfu binary format 2020-05-24 11:17:11 +02:00
Philippe Teuwen a6f76444de Put logfiles in subdir 2020-05-24 01:20:43 +02:00
iceman1001 94aa7cde2b Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2020-05-23 12:26:50 +02:00
iceman1001 9e756c5957 chg: hf mf eload - made messages more clear.\n added color to hf mf helptext 2020-05-23 12:26:33 +02:00
Philippe Teuwen aef6d7e5f2 Detect and use system Lua. Makefile. Cmake todo 2020-05-22 16:24:34 +02:00
Philippe Teuwen d7cfaae17f Load prefs only after parsing of options, don't clutter -v 2020-05-22 13:59:30 +02:00
Philippe Teuwen f30ccd0f51 Makefile: fix cp version for armsrc 2020-05-22 13:43:57 +02:00
Philippe Teuwen f27760afd6 text 2020-05-22 00:24:08 +02:00
iceman1001 de8710f854 bleeding edge bae! 2020-05-21 22:24:00 +02:00
iceman1001 d40251ff0b Revert "Release v4.9237 - Ice Coffee ☕" 
This reverts commit 833bc4d9a3.
 2020-05-21 21:55:15 +02:00
iceman1001 833bc4d9a3 Release v4.9237 - Ice Coffee ☕ 2020-05-21 21:55:15 +02:00
Philippe Teuwen bf5c054414 Revert "Release v4.9230 - Ice Coffee ☕" 
This reverts commit db2e97c860.
 2020-05-21 12:51:35 +02:00
Philippe Teuwen db2e97c860 Release v4.9230 - Ice Coffee ☕ 2020-05-21 12:51:35 +02:00
iceman1001 3e389c6e07 Revert "Release v4.9224 - Ice Coffee ☕" 
This reverts commit 9cec93fd54.
 2020-05-21 09:25:32 +02:00
iceman1001 9cec93fd54 Release v4.9224 - Ice Coffee ☕ 2020-05-21 09:25:32 +02:00
iceman1001 521a76d3c2 Revert "Release v4.9222 - Ice Coffee ☕" 
This reverts commit a5aeadc339.
 2020-05-21 09:24:38 +02:00
iceman1001 a5aeadc339 Release v4.9222 - Ice Coffee ☕ 2020-05-21 09:23:32 +02:00
Philippe Teuwen c956314a99 fix mistake 2020-05-20 21:53:47 +02:00
Philippe Teuwen a556c50f27 Remove coffee to prepare release 2020-05-20 21:39:49 +02:00
Philippe Teuwen 88ae955673 version.c in cmake 2020-05-20 21:11:45 +02:00
Philippe Teuwen 0172b0638b Makefile: wrap sh and perl calls 2020-05-20 21:11:45 +02:00
Philippe Teuwen ef586c2a41 version info also for client, still cmake to do 2020-05-20 21:11:45 +02:00
iceman1001 eb7ef65f22 chg: 'lf nexwatch clone' - only use 12bytes 2020-05-20 19:52:22 +02:00
iceman1001 b770cfd51c le24toh is uint32_t 2020-05-20 19:22:17 +02:00
Philippe Teuwen c87afd0b7d trace load: err if offline mode 2020-05-20 18:41:25 +02:00
Philippe Teuwen 15ccb34535 Add -Wconversion in EXTRACFLAGS 2020-05-20 18:41:10 +02:00
iceman1001 56bde13110 format string 2020-05-20 14:15:35 +02:00
Iceman a064bf15a6
Merge pull request #741 from xianglin1998/android_lib 
Work directory supported.
 2020-05-20 11:17:54 +02:00
iceman1001 b6d764aec9 Add: 'lf fdx demod' - decoding of Bio-Thermo lf tag. Thanks to Rosco! See Destron Fearing LifeChip with Bio-Thermo technology and http://www.proxmark.org/forum/viewtopic.php?pid=38984#p38984 2020-05-20 11:13:21 +02:00
dxl e9d06e0ec5 Follow naming conventions. 2020-05-20 16:33:21 +08:00
dxl 1a90fa90d6 work directory supported. 2020-05-20 16:05:58 +08:00
iceman1001 8c22ef076b expanded from u16 -> u32 for keys to be loaded 2020-05-20 08:58:28 +02:00
Iceman 6a87bdd44e
Merge pull request #739 from grspy/master 
Fix 32-bit time_t compilation error on WIN64
 2020-05-19 20:47:49 +02:00
iceman1001 0c248f76ad chg: hf mfdes info - textual 2020-05-19 20:45:48 +02:00
grspy 8509d233d2 Fix 32-bit time_t compilation error on WIN64 2020-05-19 20:49:25 +03:00
Philippe Teuwen cb8d589fc4 armsrc: clarify static vars vs global vars, part 3 2020-05-19 18:12:40 +02:00
iceman1001 966bcc0d28 chg: adding execute/home/current working directory functions to lua 2020-05-19 09:13:31 +02:00
Philippe Teuwen 2ba350903a more tracelog rework 2020-05-19 02:14:51 +02:00
iceman1001 e46639ee60 fifth adjustment to tracelog 2020-05-19 00:46:10 +02:00
iceman1001 00bde060c1 fourth, making struct packed 2020-05-19 00:40:22 +02:00
iceman1001 d72d804487 third part fixing cmdtracelog 2020-05-19 00:36:30 +02:00
iceman1001 97c9638518 next attempt for tracelog. simplify 2020-05-19 00:25:40 +02:00
iceman1001 837d644b6c chg: first attempt for trace log header 2020-05-18 23:49:45 +02:00
Philippe Teuwen 2ed5f1f614 iclass bf: avoid slowdown 2020-05-17 14:18:52 +02:00
iceman1001 39258fa5c5 revert... 2020-05-15 18:00:06 +02:00
Philippe Teuwen 5984e1c03e makefiles: allow to skip pthread (for termux) 2020-05-15 17:40:59 +02:00
iceman1001 43b5ba4ae2 chg: enabled param to swap modulation to test 2020-05-15 17:05:33 +02:00
iceman1001 8c65649258 better fault text 2020-05-15 17:04:33 +02:00
iceman1001 351a8d26af adjust tests 2020-05-15 17:03:28 +02:00
iceman1001 f3b4028e8a textaul, worked return codes for tests and swaped to printandlog 2020-05-15 17:02:42 +02:00
iceman1001 ddb432ec8f textual 2020-05-15 17:00:53 +02:00
iceman1001 f7bbf8b59f chg: 'lf indala demod' -more lenient size check 2020-05-15 09:00:44 +02:00
Philippe Teuwen 982f4231f7 fix coverity 263979 logically dead code 2020-05-14 18:01:52 +02:00
Philippe Teuwen 4e2d1e66ab fix coverity 286660 logically dead code 2020-05-14 17:59:46 +02:00
iceman1001 bddd2a9fc1 removed printvar 2020-05-14 17:17:47 +02:00
iceman1001 555d970c7d clock can be negative 2020-05-14 17:05:51 +02:00
iceman1001 e444640068 printandlogex 2020-05-14 16:59:02 +02:00
Philippe Teuwen 6a387c0b1b data tune, as suggested by @iceman 2020-05-14 12:58:34 +02:00
iceman1001 827439bddf cppcheck function name mis 2020-05-14 09:20:27 +02:00
iceman1001 a40c2727e6 cppcheck fix, unused struct 2020-05-14 09:19:12 +02:00
iceman1001 977b198816 cppcheck fix 2020-05-14 09:03:54 +02:00
Philippe Teuwen ffdd338dea make style 2020-05-14 01:04:26 +02:00
iceman1001 997567a9d6 cppcheck out-of-bounds 2020-05-13 23:31:01 +02:00
iceman1001 16f5107915 cppcheck mem leak 2020-05-13 23:30:42 +02:00
Philippe Teuwen 6a006677ef fancy timers 2020-05-13 23:20:46 +02:00
iceman1001 9af1807122 chg: psk demodualtion, lets keep those starting samples to easily find the zero init bit 2020-05-13 17:29:56 +02:00
iceman1001 e2671d5b50 fix coverity 286654 wrong sized argument 2020-05-13 12:26:37 +02:00
iceman1001 96108d826a fix coverity 286922 mem leak 2020-05-13 12:24:28 +02:00
Jamie Fiedler 97901a761f use machine/endian.h with osx 2020-05-13 03:35:38 -04:00
Philippe Teuwen 2c4eda6ab9 Fix 2 issues in proxendian.h, see details: 
Only some OSes include endian.h from sys/types.h, not Termux, so let's include endian.h directly.
Moreover the past logic defined BYTE_ORDER to an undef macro, so BYTE_ORDER was not undef but def to 0
and BYTE_ORDER != LITTLE_ENDIAN && BYTE_ORDER != BIG_ENDIAN was always false as (0!=0 && 0!=0)
 2020-05-13 02:09:03 +02:00
Philippe Teuwen 66fd6d70a0 hardnested: more readable preprocessing 2020-05-12 13:26:16 +02:00
iceman1001 5e4c83cc2f redundant 2020-05-12 10:30:14 +02:00
Philippe Teuwen 8dcf670f72 ore hardnested switch to handle 2020-05-12 01:17:38 +02:00
Philippe Teuwen a3aa38e624 trying to help old gcc 5... 2020-05-12 00:58:02 +02:00
Philippe Teuwen 3e05d28678 more hardnested switch to handle 2020-05-12 00:50:49 +02:00
Philippe Teuwen 7f6c078de2 fix cbor enum 2020-05-12 00:44:22 +02:00
Philippe Teuwen 2819792f8e Revert "fix osx" 
This reverts commit 09903384fa.
 2020-05-12 00:27:21 +02:00
Philippe Teuwen d2f9fb6084 fix hardnested switch-enum 2020-05-12 00:26:55 +02:00
iceman1001 09903384fa fix osx 2020-05-12 00:25:44 +02:00
iceman1001 00cca150ed Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-12 00:08:12 +02:00
iceman1001 56371fe7d5 coverity fixes 2020-05-12 00:07:06 +02:00
Philippe Teuwen 1a89680e7b fix unused-but-set warning 2020-05-11 23:52:38 +02:00
Philippe Teuwen b46a99d7d7 remove switch-enum warnings 2020-05-11 23:50:14 +02:00
iceman1001 30184b2b5c cleaning 2020-05-11 22:34:54 +02:00
iceman1001 4b68ac0a90 chg: lenient nexwatch demod sizes 2020-05-11 22:34:33 +02:00
iceman1001 5fd48305de chg: lf nexwath sim/clone - now supports 88bit format direct. See helptext for samples 2020-05-11 21:58:47 +02:00
iceman1001 093065f77a chg: 'data load' - color 2020-05-11 17:23:01 +02:00
iceman1001 d739edd13e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-11 15:00:09 +02:00
Philippe Teuwen b377ca763a cmdlft55xx : Fix buf overrun (gcc 10 error) 
src/cmdlft55xx.c:2560:43: error: ‘ - (Unknown)’ directive output may be truncated writing 21 bytes into a region of size between 15 and 24 [-Werror=format-truncation=]
 2560 |             snprintf(retStr, sizeof(buf), "%u - " _RED_("(Unknown)"), id);
      |                                           ^~~~~~~
src/cmdlft55xx.c:2560:13: note: ‘snprintf’ output between 23 and 32 bytes into a destination of size 25
 2560 |             snprintf(retStr, sizeof(buf), "%u - " _RED_("(Unknown)"), id);
      |             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 2020-05-11 13:58:38 +02:00
Philippe Teuwen b40c8dd5d2 tinycbor: avoid overriding cflags, hide warnings 2020-05-11 13:47:19 +02:00
iceman1001 11884df687 textual 2020-05-11 11:45:45 +02:00
iceman1001 e94c61ee1a Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-11 11:45:04 +02:00
Philippe Teuwen 2f293e211a show compiler version 2020-05-11 10:21:32 +02:00
iceman1001 0c20369c3f Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-11 10:00:36 +02:00
iceman1001 9b08f7c39b chg: 'lf nexwatch demod' - now detects type, and show parity /chksum 2020-05-11 09:29:51 +02:00
Philippe Teuwen c1209ca0f5 (clang) fix unused function warning 2020-05-11 02:16:43 +02:00
Philippe Teuwen f6245cdb79 fix appveyor multiple definition of enum error 2020-05-11 01:23:28 +02:00
iceman1001 4d34c8d4d5 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-05-11 01:14:04 +02:00
iceman1001 280b7d9c46 chg: 'lf nexwatch demod' - correct parity calc 2020-05-11 01:13:58 +02:00
Philippe Teuwen 8a9c7d2efc argtable3: fix buffer overrun 
This bug was suddently triggered by Appveyor compilation and seems to make sense.

[-] CC argtable3.c

    inlined from 'arg_cat_option' at argtable3.c:4208:13,
    inlined from 'arg_print_syntax' at argtable3.c:4392:9:
argtable3.c:4149:11: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=]
 4149 |     *dest = 0;
      |     ~~~~~~^~~
argtable3.c: In function 'arg_print_syntax':
argtable3.c:4381:14: note: at offset 200 to object 'syntax' with size 200 declared here
 4381 |         char syntax[200] = "";
      |              ^~~~~~
 2020-05-10 23:59:46 +02:00
iceman1001 f3293c9dcd chg: lf nexwatch demod - now descrambles the id aswell 2020-05-10 22:29:29 +02:00
Philippe Teuwen dc8178d43e Remove type-limits warning 2020-05-09 15:27:35 +02:00
Philippe Teuwen 1b0fd2389a Remove tautological-type-limit-compare 2020-05-09 14:41:12 +02:00
Philippe Teuwen 394397c54e silent tinycbor warnings 2020-05-09 12:56:40 +02:00
iceman1001 cfa75a6cab missing field init 2020-05-09 12:32:19 +02:00
iceman1001 39c000fb53 missing field initialise 2020-05-09 12:27:53 +02:00
Philippe Teuwen e695223d3b mf textual 2020-05-09 11:58:47 +02:00
Philippe Teuwen c349aa0a13 make style 2020-05-09 00:24:20 +02:00
iceman1001 c687ced062 chg: lf keri demod - more leanient when it comes to bits 2020-05-08 21:14:23 +02:00
Philippe Teuwen 24c85e74ac I see coverity coming... 2020-05-08 18:14:29 +02:00
iceman1001 36cad6f51a textual 2020-05-08 18:12:39 +02:00
Philippe Teuwen ff7b7b3a6f proper filtering of RL markers 2020-05-08 18:12:10 +02:00
Philippe Teuwen f97516ca38 textual coherence 2020-05-08 17:42:37 +02:00
Philippe Teuwen 68cb1efe14 Clean deps just in case 2020-05-08 17:40:13 +02:00
Philippe Teuwen c24df1547a android cmake: remove c99 restriction 2020-05-08 17:04:28 +02:00
Philippe Teuwen a2b776ed1e Remove redundant def 2020-05-08 17:04:28 +02:00
Philippe Teuwen 74f16dc092 move whereami to deps 2020-05-08 17:04:28 +02:00
iceman1001 b78e060909 textual 2020-05-08 16:43:31 +02:00
iceman1001 b028b90f03 fix coverity 286652 286658 286662 2020-05-08 15:03:08 +02:00
iceman1001 f70210ebef textual 2020-05-08 13:27:45 +02:00
iceman1001 1621b0e7c8 trace list - different alloc 2020-05-08 13:23:06 +02:00
iceman1001 f6c2516779 chg: "trace list" - adjust messages 2020-05-08 12:30:18 +02:00
Philippe Teuwen 293b638f71 fix mem corruption in trace load/list 2020-05-08 11:55:43 +02:00
Philippe Teuwen 59057b6a35 banners: clang still warns on unused static inlines fcts, change strategy 2020-05-08 00:48:20 +02:00
Philippe Teuwen 3a75de1215 rework banners 2020-05-08 00:15:41 +02:00
Philippe Teuwen 1ad5cc473f rework banners 2020-05-07 23:00:45 +02:00
Philippe Teuwen 1c136c3e93 Let's see if the prompt suffixed spaces are still needed. Please shout if it breaks. 2020-05-07 21:56:43 +02:00
Philippe Teuwen edb1c85cd3 fix colored readline prompt bug 2020-05-07 21:56:09 +02:00
Philippe Teuwen a8a9e98ca2 Revert "Let's see if the prompt suffixed spaces are still needed. Please shout if it breaks." 
ok now I see where it breaks :) will debug locally...

This reverts commit 4066287b98.
 2020-05-07 19:44:03 +02:00
Philippe Teuwen 4066287b98 Let's see if the prompt suffixed spaces are still needed. Please shout if it breaks. 2020-05-07 19:17:09 +02:00
Philippe Teuwen d6fd7f14d6 simpler ul_print_type 2020-05-07 19:14:53 +02:00
Philippe Teuwen 94d4f2b75e fix cmake for reveng 2020-05-07 14:45:53 +02:00
Philippe Teuwen b9f6f096aa hook reveng outputs to pm3 machinery, add regression test 2020-05-07 14:20:49 +02:00
Philippe Teuwen a9964f4f51 Merge branch 'android_lib' 
* android_lib:
  make style
  cmake android: add backslashes for host compatibility
  Translation some comments from Chinese to English.
  Android cmake: use common cmake files for deps
 2020-05-07 12:20:02 +02:00
Philippe Teuwen b34851d281 make style 2020-05-07 12:19:46 +02:00
Philippe Teuwen 00b5841597 cmake android: add backslashes for host compatibility 2020-05-07 12:13:52 +02:00
dxl e8999f3318 Translation some comments from Chinese to English. 2020-05-07 16:57:15 +08:00
Philippe Teuwen 3c9a19d4c1 Revert "update argtable3" 
It was an attempt to solve the mysterious reveng getopt bug
but it brings more troubles and throws away multi-platform pm3 tuning

This reverts commit f3790a89a5.
 2020-05-07 01:00:40 +02:00
Philippe Teuwen 2fcad93efc proper way to fix reveng getopt bug 2020-05-07 00:23:19 +02:00
Philippe Teuwen a2a5700a85 fix reveng getopt bug 2020-05-06 23:33:55 +02:00
Philippe Teuwen f3790a89a5 update argtable3 2020-05-06 23:33:30 +02:00
Philippe Teuwen 59453aea8b Android cmake: use common cmake files for deps 2020-05-06 15:33:31 +02:00
Philippe Teuwen 53af4304c1 cmake deps: add prefix pm3rrg_rdv4_ 2020-05-06 15:21:29 +02:00
Philippe Teuwen 9478dbc071 cmake deps: add -fPIC so they can be integrated in a pm3 shared lib 2020-05-06 15:20:43 +02:00
Philippe Teuwen eafeb47126 make style 2020-05-06 13:38:51 +02:00
dxl 4b41e36d49 Android platform adaptation(dxl) 2020-05-06 13:01:29 +02:00
dxl 78ee43c9c4 Android platform adaptation(dxl) 2020-05-06 13:01:29 +02:00
Philippe Teuwen d118ba9e06 comment out unused iceIIR_Butterworth 2020-05-06 13:01:17 +02:00
dxl fcf0265704 missing include 2020-05-06 13:01:17 +02:00
dxl 021ee95e07 don't mix ifdef and defined 2020-05-06 13:01:17 +02:00
iceman1001 70add3fabe fix: "trace list" too short array for explanation 2020-05-06 12:14:05 +02:00
iceman1001 6dadbb0423 chg: rpi aling warning 2020-05-05 08:19:26 +01:00
Philippe Teuwen 30e96ece74 lf nedap: fix cast align warning 2020-05-05 00:16:53 +02:00
Philippe Teuwen 2c250d5d14 hf epa: fix cast align warning 2020-05-04 23:58:58 +02:00
Philippe Teuwen e68dd9e5cb update whereami and avoid compiling unnneded troublesome parts 2020-05-04 23:18:00 +02:00
Philippe Teuwen 99381b4386 fix defined 2020-05-04 01:48:07 +02:00
Philippe Teuwen 58f71d97f5 silent some bad-function-cast 2020-05-04 01:18:26 +02:00
Philippe Teuwen 723503b74e unshadow vars 2020-05-03 22:50:03 +02:00
Philippe Teuwen 4d4984657e activate more warnings and ease their mgmt 2020-05-03 19:46:11 +02:00
Philippe Teuwen c94eae0046 fix warning about cast realignment, WIP 2020-05-03 17:34:01 +02:00
Philippe Teuwen 82ad1b683a bug ifneq <> ifeq 2020-05-03 12:50:33 +02:00
Philippe Teuwen ed1fb14f5f rework C includes in C++ 2020-05-03 12:46:46 +02:00
Philippe Teuwen 19be62f7e6 stricter warnings: Wredundant-decls 2020-05-03 12:38:34 +02:00
Philippe Teuwen 6221d28e43 cflags 2020-05-03 12:19:42 +02:00
Philippe Teuwen 3529aea157 stricter warnings, wip 2020-05-03 01:13:28 +02:00
Philippe Teuwen 9358554884 stricter warnings, wip 2020-05-03 00:33:28 +02:00
Philippe Teuwen 0e39cb8e34 stricter warnings, wip 2020-05-02 23:54:27 +02:00
iceman1001 796cd36f85 chg: better error message when serial port allocation fails 2020-05-02 19:24:52 +02:00
iceman1001 96f03b4933 chg: leanient parsing of tcp:/bt:/socket: vars 2020-05-02 17:52:22 +01:00
Philippe Teuwen 6d0afbdbf3 Revert "client Makefile: link with pthread only if needed" 
This reverts commit 43b69bd4e4.
 2020-05-01 00:28:28 +02:00
Philippe Teuwen 43b69bd4e4 client Makefile: link with pthread only if needed 2020-05-01 00:25:04 +02:00
Philippe Teuwen f158f347e5 reveng Makefile: allow to skip test (e.g. for cross-compilation) 2020-05-01 00:13:56 +02:00
Philippe Teuwen 40c596e8af client Makefile: allow to add includes (e.g. for termux) 2020-05-01 00:08:07 +02:00
Uli Heilmeier f9eb1d3d77 Makefile: fix PKG_CONFIG_ENV 
renaming PKG_CONFIG_PATH to PKG_CONFIG_ENV was too greedy
 2020-04-29 22:52:41 +02:00
iceman1001 fa44eee82c chg: "lf sim" - now only fills until bigbuffer is full 2020-04-29 20:33:29 +02:00
Philippe Teuwen 31ccc7d7ca hardnested: don't drop field when in test mode 2020-04-29 20:20:06 +02:00
Philippe Teuwen 07f41da74d fix coverity 226490 even if in practice next_common_bits is never > 7 2020-04-29 20:11:43 +02:00
Philippe Teuwen b3f84bf7b3 make style 2020-04-29 19:41:45 +02:00
Philippe Teuwen 250418f64b client Makefile: make sure to rebuild deps when needed 2020-04-29 19:18:01 +02:00
iceman1001 85f2233161 coverity fix 226496 226492 226490 2020-04-29 17:27:17 +02:00
iceman1001 5363385845 coverity fix 286655 2020-04-29 16:35:08 +02:00
Philippe Teuwen 7ca7677568 Linux: add native support for Bluetooth in client 2020-04-29 14:26:12 +02:00
iceman1001 cdb99fe650 cppchecker fix - duplicate 2020-04-28 22:58:05 +02:00
iceman1001 4896390dde cppchecker fix 2020-04-28 22:31:45 +02:00
iceman1001 a7ececcb5d cppcheck fix - duplicate condition 2020-04-28 22:26:16 +02:00
iceman1001 78cc7e10a5 cppcheck fix - duplicate condition 2020-04-28 21:53:01 +02:00
iceman1001 cd19bf81a8 cppcheck fix 2020-04-28 21:51:13 +02:00
iceman1001 0f5e4fe220 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-28 19:58:31 +02:00
iceman1001 d2e85b0040 coverity fix: shawdowfunction (stdio)\n. unsupported command shouldn't break execution (dfnames) 2020-04-28 19:58:15 +02:00
Philippe Teuwen fbd0a7e284 typo 2020-04-28 19:58:07 +02:00
iceman1001 857526a945 coverity fix 286651 2020-04-28 19:08:07 +02:00
iceman1001 12f87938ea coverity fix 279110 2020-04-28 18:51:24 +02:00
iceman1001 084a8161d4 coverity fix: 279106 2020-04-28 18:24:52 +02:00
Bjoern Kerler 3eee351f4f Return PM3_SUCCESS if iso df names not supported 2020-04-28 18:16:52 +02:00
iceman1001 7303dd8c5d coverity fix 279922 , div by zero 2020-04-28 14:51:47 +02:00
iceman1001 fa98a10b38 coverity fix 286651 2020-04-28 14:38:32 +02:00
iceman1001 0896cee51c coverity fix 286680 2020-04-28 14:35:00 +02:00
iceman1001 0759f886f4 coverity fix 286923 2020-04-28 14:33:45 +02:00
iceman1001 5e925962d3 coverity fix 286994 2020-04-28 14:32:12 +02:00
iceman1001 25c94177f8 coverity fix 286664 2020-04-28 14:31:29 +02:00
iceman1001 6a55330398 enforce PACKED structs 2020-04-28 13:53:43 +02:00
iceman1001 662d3259ca cppchecker fix, shadow var 2020-04-28 13:46:13 +02:00
iceman1001 f1df27e6bb cppchecker fix - better return value handling 2020-04-28 13:44:25 +02:00
iceman1001 19a5a70cc8 cppchecker fix, now use res 2020-04-28 13:36:24 +02:00
iceman1001 d98f8e96f4 chg: hf iclass loclass - use defines, cppchecker happy 2020-04-28 13:28:29 +02:00
iceman1001 cf9a5a4850 coverity fix 286921, 286922, .. 2020-04-26 19:29:22 +02:00
iceman1001 e36a8ca5fb coverity fix 286920 2020-04-26 19:28:58 +02:00
iceman1001 a3a7dfa5a1 coverity / cppchecker fixes : dont like that code style 2020-04-26 14:27:44 +02:00
iceman1001 00cac87fb2 coverity fix - resource leaks 2020-04-26 14:15:59 +02:00
iceman1001 5e51a72cae coverity fix 286678 - resource leak 2020-04-26 14:13:12 +02:00
iceman1001 2e2bfc17a0 coverity fix: 286678 2020-04-26 13:54:55 +02:00
iceman1001 dd5679a53a cppchecker fixes 2020-04-26 13:49:06 +02:00
iceman1001 f416fa9b4f cppchecker fixes 2020-04-26 12:56:19 +02:00
Philippe Teuwen 7cd509c77c make style 2020-04-26 11:18:04 +02:00
Philippe Teuwen 99eadded05 Merge branch 'settings' 
* settings:
  Get/display a single preference
  Lighter msg for loading prefs, json will anyway always tell the filename
  Make sure colors and emoji are disabled when not on TTY
  Comment out file path code
  Pre Filepath cleanup
  Update preferences.c
  tuning
  streamline works
  Update fileutils.c
  updates
  clean up
  device debug and tweaks
 2020-04-26 11:16:29 +02:00
netvader eea4e5b147
Update aid_desfire.json 2020-04-26 09:08:43 +02:00
mwalker33 572f46ceee Merge branch 'settings' of https://github.com/RfidResearchGroup/proxmark3 into settings 2020-04-26 10:20:23 +10:00
mwalker33 ba0b28a7de Get/display a single preference 2020-04-26 10:18:00 +10:00
Philippe Teuwen 9bd5f27414 Rename PKG_CONFIG_PATH so it can be overruled by env 2020-04-26 01:24:33 +02:00
Philippe Teuwen ae21a3148f Lighter msg for loading prefs, json will anyway always tell the filename 2020-04-25 15:17:11 +02:00
Philippe Teuwen a15d14e038 Make sure colors and emoji are disabled when not on TTY 2020-04-25 15:10:34 +02:00
Philippe Teuwen 0e1b1e166b Remove redundant debug stdin info now that we have PROXPROMPT_CTX_STDIN 2020-04-25 11:13:39 +02:00
mwalker33 a8ff7b4815 Comment out file path code 2020-04-25 18:37:23 +10:00
Philippe Teuwen ad3267cec1 fix osx, hopefully 2020-04-25 01:16:39 +02:00
Philippe Teuwen ebd476a9c5 hardnested make: fix default compiler 2020-04-24 21:45:46 +02:00
Philippe Teuwen 8725807a8c minor 2020-04-24 18:58:28 +02:00
Philippe Teuwen 011f973e7f make style 2020-04-24 18:21:38 +02:00
mwalker33 7fdaa51678 Pre Filepath cleanup 2020-04-24 16:45:17 +02:00
mwalker33 3aee4fc5e9 Update preferences.c 2020-04-24 16:45:17 +02:00
mwalker33 dd09d4074c tuning 
File List optimised.
 2020-04-24 16:45:17 +02:00
mwalker33 600e5d7d6f streamline works 2020-04-24 16:45:17 +02:00
mwalker33 5060a52b3a Update fileutils.c 
Linux file permission fix
 2020-04-24 16:45:17 +02:00
mwalker33 e2c56fe26c updates 
Added dump and trace path and clean a little for cleaner use and expansion.
 2020-04-24 16:45:17 +02:00
mwalker33 b593d2c319 clean up 2020-04-24 16:45:17 +02:00
mwalker33 49c6806b1b device debug and tweaks 2020-04-24 16:45:17 +02:00
Philippe Teuwen fbe4e20326 remove c99 and c++11 restrictions 2020-04-24 16:43:21 +02:00
Philippe Teuwen 8c84d21a92 makefile: limit -D_ISOC99_SOURCE to Mingw 2020-04-24 16:42:41 +02:00
Philippe Teuwen d6564e8eca fix cmake for mingw 2020-04-24 00:08:42 +02:00
Philippe Teuwen 02d83c2ebf Moving mfc_gen3_writer.lua to a branch till it becomes useable 2020-04-23 20:26:07 +02:00
netvader b5d07ab914
Update aid_desfire.json 2020-04-23 17:27:16 +02:00
unknown d041f3fc82 Fixed a block key check 2020-04-22 18:59:02 +03:00
Philippe Teuwen 7c27931685 cmake qt fix regression 2020-04-22 15:31:44 +02:00
Philippe Teuwen 05e7def3d5 cmake & rpi, take 2 2020-04-22 14:57:30 +02:00
Philippe Teuwen 869d96f118 cmake: fix rpi 2020-04-22 14:14:28 +02:00
Philippe Teuwen 25c1f31222 fix includes 2020-04-22 14:14:13 +02:00
Philippe Teuwen 00248d9aa7 cmake: less verbose when no Qt present 2020-04-22 13:55:28 +02:00
Philippe Teuwen 65d9408879 prompt: [usb|script] style 2020-04-22 12:24:21 +02:00
Philippe Teuwen 7760dd77e5 Add context to prompt 2020-04-22 12:22:24 +02:00
Philippe Teuwen 1f5544330c prompt: filter ansi before calling readline 2020-04-22 09:32:32 +02:00
Philippe Teuwen 8bdda55115 Fix prompt colors in log -> spurious space in color macros -> adjust lots of files... 2020-04-22 02:22:55 +02:00
Philippe Teuwen 3235468e05 make style 2020-04-21 23:24:01 +02:00
Philippe Teuwen f83d4b6c16
Merge pull request #699 from bkerler/mfdes_devel 
Add hf mf des chk and dump commands
 2020-04-21 23:23:01 +02:00
Philippe Teuwen 31d3f519c7 rename scritp accordingly to its own help 2020-04-21 22:51:36 +02:00
Philippe Teuwen 73c4a37684
Merge pull request #707 from Windslab/master 
A lot of improvements
 2020-04-21 21:22:07 +02:00
Philippe Teuwen a68b8983f2 make style 2020-04-21 01:56:51 +02:00
Philippe Teuwen 31e79905f8 Clean more old paths 2020-04-21 01:44:31 +02:00
unknown aae1f3c881 A lot of improvements 2020-04-20 20:29:32 +03:00
Philippe Teuwen 69b6a8f7f9 make clean: remove also old stuff 2020-04-19 16:31:25 +02:00
Philippe Teuwen e4dea67cf3 rework reveng<>cliparser 2020-04-19 13:13:13 +02:00
Philippe Teuwen 07f3022aa6 make/cmake add common_fpga 2020-04-19 13:01:51 +02:00
Philippe Teuwen 2676740fb3 make/cmake: remove weirdy include paths like src/uart/../crypto 2020-04-19 12:53:46 +02:00
Philippe Teuwen 4967096e3b make/cmake cliparser lib and remove redundant getopt from reveng 2020-04-19 12:40:50 +02:00
Philippe Teuwen 5f4385986c cleaning makefile & cmake 2020-04-19 12:40:46 +02:00
Philippe Teuwen 8ea0f19181 minor 2020-04-19 00:59:02 +02:00
Philippe Teuwen 43d88c40e5 minor 2020-04-19 00:58:13 +02:00
Nahuel Grisolia 7e18a331d9 Fix uint8 vs uint32 interval number for tearoff experiment 2020-04-18 18:56:11 -03:00
Nahuel Grisolia c73c09cbf6 Updated help and default values 2020-04-18 18:33:09 -03:00
Nahuel Grisolía da81424348 OTP-TEAR 2020-04-18 21:37:31 +02:00
Philippe Teuwen a04c8cb41c cosmetic 2020-04-18 20:42:38 +02:00
Philippe Teuwen f94a98b9c6 cmake qt5: no need for custom command if AUTOMOC? 2020-04-18 20:14:18 +02:00
Philippe Teuwen 17aacae8d3 fix clean path after src reorg 2020-04-18 20:13:46 +02:00
Philippe Teuwen 45134859cf cmake: remove unneeded PIC in hardnested lib 2020-04-18 20:01:51 +02:00
Philippe Teuwen c2ff11f321 hardnested compilation reorganized to be similar with cmake approach 2020-04-18 19:41:14 +02:00
Bjoern Kerler b41c5769e7 Fix DESFIRE_UNKNOWN 2020-04-18 18:35:50 +02:00
Philippe Teuwen 26c28c188a minor 2020-04-18 18:20:19 +02:00
Philippe Teuwen f9857a8b0c cmake: add cflags 2020-04-18 17:37:11 +02:00
Philippe Teuwen dc6b751ea3 cmake: rework includes, wip, need to modify more src after merge 2020-04-18 16:27:20 +02:00
Philippe Teuwen f32974bb07 cmake libs static 2020-04-18 16:27:20 +02:00
Philippe Teuwen 2aa587f35f cmake: reveng keep includes local 2020-04-18 16:27:20 +02:00
Philippe Teuwen b5ce5c1d99 cmake: mbedtls keep includes local 2020-04-18 16:27:20 +02:00
Philippe Teuwen 1ccd764837 cmake: hardnested 2020-04-18 16:27:20 +02:00
Philippe Teuwen c5d2655ebe cmake: fix reveng defines, keep them local 2020-04-18 16:27:20 +02:00
Philippe Teuwen 0b68f3b81e cmake: fix zlib defines, keep them local 2020-04-18 16:27:20 +02:00
Philippe Teuwen b7fb3b0746 cmake: fix jansson defines, keep them local 2020-04-18 16:27:20 +02:00
Philippe Teuwen 0fc5c41a49 cmake: fix liblua platform definitions to match regular Makefile 2020-04-18 16:27:20 +02:00
Philippe Teuwen 397f46c0ef cmake: Fix the (not yet used) amiibo srcs 2020-04-18 16:27:20 +02:00
Philippe Teuwen 01432fd84b Lower cmake min version to 3.10 for WSL 2020-04-18 16:24:29 +02:00
Philippe Teuwen 1a344a933d Remove header files from CMakeLists 2020-04-18 16:24:29 +02:00
Uli Heilmeier 18f875cb84 cmake macOS: use brew installed readline 2020-04-18 16:24:29 +02:00
Uli Heilmeier c888fcdb7e Fix cmake qt: remove REQUIRED 2020-04-18 16:24:29 +02:00
TrustedUser 5003434885 ¨fix: osc cmake 2020-04-18 16:24:29 +02:00
Uli Heilmeier 6562c22029 Fix qt5_found handling 2020-04-18 16:24:29 +02:00
Uli Heilmeier 64e7aa4c46 cmake: fix qt handling for macos 
This is like we find qt in the Wireshark project.

Tested it with macOS. Not tested with Linux, Windows etc.
 2020-04-18 16:24:29 +02:00
Iceman 4e233c682d Update CMakeLists.txt 2020-04-18 16:24:29 +02:00
Philippe Teuwen ad28dc1fa0 cmake: remove custom rule for .ui, we already have AUTOUIC 2020-04-18 16:24:29 +02:00
Philippe Teuwen fdccfb2b88 add cmake build in Travis 2020-04-18 16:24:29 +02:00
Bjoern Kerler 78a5e666bb Fix QT5 GUI CMake 2020-04-18 16:24:29 +02:00
Bjoern Kerler 6b1a8b8390 Add cmake support 2020-04-18 16:24:29 +02:00
Philippe Teuwen edb96e75cf Add QT_NO_DEBUG flag 2020-04-18 12:20:42 +02:00
Philippe Teuwen 7acc43fe9f Removing debug flag 2020-04-18 12:10:03 +02:00
Bjoern Kerler 0762d29bb3 Another key 2020-04-17 21:37:16 +02:00
Bjoern Kerler 68747f5bbd More keys 2020-04-17 21:25:13 +02:00
Bjoern Kerler 4b3a78538c HF MFDES dump + chk commands added 2020-04-17 21:06:32 +02:00
iceman1001 69142baa7f chg: "hf topaz info" - textual 2020-04-17 10:30:18 +02:00
iceman1001 40c69b3f83 chg: "lf hitag info" - added HITAG type detection (Thanks! @cosmo61) 2020-04-17 10:29:54 +02:00
iceman1001 b0854bb3aa chg: SOCKET: connections (@xianling1998) 2020-04-16 16:46:45 +02:00
iceman1001 1bf32aad90 Chg: android adaptions from @xianglin1998 2020-04-16 16:46:09 +02:00
Philippe Teuwen 315cda0754
Merge pull request #692 from kalekume/patch-2 
Added new AID F001D0
 2020-04-16 11:58:35 +02:00
Bjoern Kerler 81bc0bc2b9 Reorder client src directories 2020-04-16 10:53:24 +02:00
kalekume 68f269ee3d
Added new AID F001D0 2020-04-16 10:36:42 +02:00
Philippe Teuwen 94192d0976 make style 2020-04-16 09:01:14 +02:00
iceman1001 588f7e98f5 more aid:s-... 2020-04-16 08:12:08 +02:00
netvader 6ad5c1f872
Update aid_desfire.json 2020-04-15 09:55:55 +02:00
Iceman 4a7d2838ec
Merge pull request #688 from mwalker33/Settings-2 
Quick Fix
 2020-04-15 09:47:28 +02:00
mwalker33 bdc4aae6a6 Typo 2020-04-15 17:42:11 +10:00
Iceman 5c511d35a9
Merge pull request #687 from mwalker33/Settings-2 
Settings - full path name
 2020-04-15 09:34:51 +02:00
mwalker33 5545219f82 Update Full Path 2020-04-15 16:40:28 +10:00
iceman1001 71e1c5e53b added more DESFire aids 2020-04-15 07:56:55 +02:00
Iceman 23a0a6ece8
Merge branch 'master' into master 2020-04-14 22:03:04 +02:00
Ahmet Bilal Can 169d788fe9
add istanbulkart aid 2020-04-14 22:32:00 +03:00
Uli Heilmeier d67af053fc AID Desfire: Add clipper card 2020-04-14 21:27:41 +02:00
mwalker33 0b43252a02 Test code for full path 2020-04-14 19:17:00 +10:00
iceman1001 7ee49df717 Chg: updates from whereami repo. I am sure I broke something now 2020-04-14 09:24:08 +02:00
Bjoern Kerler 5fc922f6f9 Add Key display on enum 2020-04-14 00:35:22 +02:00
Bjoern Kerler 5c4148ec15 Fixes after pull 2020-04-13 23:56:04 +02:00
Bjoern Kerler 0ff31a9fa8 changes 2020-04-13 23:54:05 +02:00
Bjoern Kerler 49f93cbbd0 Implement several commands 2020-04-13 23:50:05 +02:00
iceman1001 abfcb524b5 minor coverity fixes 2020-04-13 14:47:36 +02:00
Iceman ba926addfb
Merge pull request #679 from uhei/clang-warn3 
cmdhfmfdes: Fix clang tautological-pointer-compare warning
 2020-04-13 14:25:48 +02:00
Uli Heilmeier dc002d224a cmdhfmfdes: Fix clang tautological-pointer-compare warning 
Fixes:  RfidResearchGroup/proxmark3#676
 2020-04-13 12:56:36 +02:00
Iceman ced45cf865
Merge pull request #678 from mwalker33/Settings-2 
getwd quick fix compile error
 2020-04-13 12:50:10 +02:00
mwalker33 fd5fe61462 getwd fix 2020-04-13 20:46:01 +10:00
Iceman e1c65296a3
Merge pull request #677 from mwalker33/Settings-2 
Settings 2
 2020-04-13 12:34:42 +02:00
mwalker33 acf4c09aa3 Update proxguiqt.h 
Cleanup
 2020-04-13 19:43:15 +10:00
mwalker33 dded69c989 Update proxmark3.c 
Disable use_prefence_file
 2020-04-13 19:35:19 +10:00
mwalker33 3b4f851d2d tweak save 2020-04-13 16:17:57 +10:00
mwalker33 0cc2bda952 Update preferences.c 
Error msg and show help if invalid option detected
 2020-04-13 14:39:16 +10:00
mwalker33 82bbea3874 Update preferences.c 2020-04-13 14:12:54 +10:00
mwalker33 c924e2d589 save on exit 2020-04-13 13:51:03 +10:00
mwalker33 b72123a093 Update preferences.c 2020-04-13 12:44:34 +10:00
mwalker33 0b360d4dc0 Preference commands rework 2020-04-13 12:12:47 +10:00
mwalker33 69eef755d3 Window Size/Pos Tracking 2020-04-13 09:32:47 +10:00
Bjoern Kerler 9c4cf973ab NONE is NULL 2020-04-13 01:26:44 +02:00
Bjoern Kerler e543637897 PICC Format fixes 2020-04-13 01:19:26 +02:00
Bjoern Kerler 30a044445a Add mifare desfire CreateStdDataFile 2020-04-13 00:59:01 +02:00
Bjoern Kerler 11ca483617
Merge pull request #25 from RfidResearchGroup/master 
Update
 2020-04-12 21:29:33 +02:00
iceman1001 99d7a0a1c9 chg: hf mfu ndef - better message when failed to find a mfu tag 2020-04-12 21:27:32 +02:00
iceman1001 4cc6d3858d fix: no error message when para was zero 2020-04-12 21:23:52 +02:00
Bjoern Kerler b90539f2f0 Port des on client to mbedtls_des 2020-04-12 21:02:15 +02:00
Bjoern Kerler f234c34d1c Update 2020-04-12 20:59:27 +02:00
Bjoern Kerler c06864dcc7 Rename due to name conflict 2020-04-12 18:09:14 +02:00
Bjoern Kerler 44e9d13d1a Make style 2020-04-12 17:41:36 +02:00
Bjoern Kerler f76de40982 Rework auth for client and device 2020-04-12 17:39:11 +02:00
Bjoern Kerler b0af460a6e
Merge pull request #24 from bkerler/master 
Update
 2020-04-12 17:11:47 +02:00
Bjoern Kerler 7aa27cfefb Auth of des, 3des and aes working. 2020-04-12 17:10:27 +02:00
mwalker33 4177f51770 Update proxguiqt.cpp 2020-04-12 20:59:18 +10:00
mwalker33 ce38dd92ba Update proxguiqt.cpp 2020-04-12 20:42:10 +10:00
mwalker33 87e58442fb Update proxguiqt.cpp 2020-04-12 20:36:05 +10:00
mwalker33 7fa8587dd2 Plot Windows Move Realtime 2020-04-12 20:24:56 +10:00
mwalker33 5df9d3d8f7 fix 
use autocreate pref file.
user pref for color/emoji linux
 2020-04-12 19:49:17 +10:00
iceman1001 682bded18a starting with a application id file for desfire, for known application id:s. 2020-04-12 11:14:10 +02:00
iceman1001 3454076901 chg: make which key to use more promenent 2020-04-12 11:07:20 +02:00
iceman1001 3cae25aa87 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-12 10:56:39 +02:00
mwalker33 6d08936f04 Update cmdhfmf.c 
key table format fix. (extra space)
 2020-04-12 17:56:29 +10:00
iceman1001 2476ce509b Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-12 09:55:46 +02:00
Iceman 04f8adbf32
Merge pull request #671 from mwalker33/Settings-2 
Settings - Update
 2020-04-12 09:06:51 +02:00
mwalker33 ac8c139867 Update preferences.c 2020-04-12 13:08:02 +10:00
mwalker33 c9bd43c4b6 Edit and Updates 
Changed from settings to preferences.
Added UTF8 Banner support
Added Show/Edit draft
 2020-04-12 13:07:25 +10:00
iceman1001 309020c64c more error messages when failing parsing 2020-04-11 20:41:05 +02:00
Iceman de0768fadc
Merge pull request #669 from bkerler/authtest 
Fix bug for file id handling in hf mf des enum :)
 2020-04-11 13:26:14 +02:00
Bjoern Kerler 0c407504b3 Fix file ids handling 2020-04-11 13:14:16 +02:00
Iceman b387196cf2
Merge pull request #666 from bkerler/authtest 
Rewrite and fix hf mfdes auth
 2020-04-11 11:52:09 +02:00
Bjoern Kerler 637103224d Fixes 2020-04-11 11:32:31 +02:00
mwalker33 1900f6b16a Overlay 2020-04-11 17:26:43 +10:00
Iceman b643c70f0d
Merge pull request #668 from mwalker33/Settings-2 
Settings Update
 2020-04-11 07:40:46 +02:00
Bjoern Kerler f71e7438f7 Improve DecodeFileSettings log 2020-04-11 03:10:02 +02:00
Bjoern Kerler 37aa19ad6c Add 2k3 des iso support preparation 2020-04-11 02:56:08 +02:00
Bjoern Kerler 4c2f98ac3d Add first 3K3 support. Improve algo error handling 2020-04-11 02:32:55 +02:00
Bjoern Kerler 9b26fab1c2 Further auth info fixes 2020-04-11 01:41:39 +02:00
Bjoern Kerler 327d8a8bfe Further aid and auth info fixes 2020-04-11 01:38:47 +02:00
Bjoern Kerler 93e4a66971 Improve UI handling and fix AID/FID display 2020-04-11 00:31:55 +02:00
mwalker33 7fa7eeba97 Update settings.c 2020-04-11 08:21:16 +10:00
Bjoern Kerler c6323a5fe1 Fix bad bug. Don't check dest for NULL 2020-04-10 23:45:54 +02:00
Bjoern Kerler 52b41fc883
Merge pull request #22 from RfidResearchGroup/master 
Update
 2020-04-10 23:01:52 +02:00
Bjoern Kerler 70b000bc79 Make style 2020-04-10 22:59:55 +02:00
Bjoern Kerler 8f3a02fc50 Add Deselect on info and enum 2020-04-10 22:56:45 +02:00
Bjoern Kerler 08469f940a Replace MIX and OLD Commands 2020-04-10 22:52:16 +02:00
Bjoern Kerler 68faa88e6a Auth test 2020-04-10 21:02:46 +02:00
mwalker33 933d7523f7 Tweaks and supports_colors 2020-04-10 19:51:08 +10:00
iceman1001 bb0b368e68 fix... 2020-04-10 10:50:17 +02:00
iceman1001 8e74978855 code fixes, better handling of card identification and outputs accordingly. 2020-04-10 10:31:18 +02:00
iceman1001 69732ef709 better identification of PLus vs Plus EV1. Be verycareful of that WRITEPERSO cmd inside INFO to detect card type. No good at all 2020-04-10 10:30:37 +02:00
iceman1001 df0aaa020d fix: string too short 2020-04-10 10:28:52 +02:00
iceman1001 0e2ac41717 annotage desfire more 2020-04-10 10:28:15 +02:00
mwalker33 9fc232390b Update Client debug level 2020-04-10 18:20:02 +10:00
mwalker33 970b2bf2cb debug level fix 2020-04-10 16:14:43 +10:00
mwalker33 1b8b8f0128 Settings Added 2020-04-10 15:04:11 +10:00
mwalker33 070636f196 Fix Sync 2020-04-10 14:36:29 +10:00
mwalker33 978f57b505 Revert "Merge pull request #32 from RfidResearchGroup/master" 
This reverts commit 40d2a3c072, reversing
changes made to 15d584e060.
 2020-04-10 13:59:56 +10:00
mwalker33 0542825567 Revert "Add settings" 
This reverts commit 430ca985d3.
 2020-04-10 13:58:57 +10:00
mwalker33 430ca985d3 Add settings 
Plot Windows, log level, emoji, hints
 2020-04-10 13:52:50 +10:00
Bjoern Kerler cd35b60d13 Minor typo 2020-04-10 01:26:37 +02:00
Bjoern Kerler 82323b14e2 Make style 2020-04-10 01:18:48 +02:00
Bjoern Kerler 7af0f07c4e Add useful signature info. 2020-04-10 00:59:06 +02:00
Bjoern Kerler 685b1e47ef Fix unnecessary stuff. 2020-04-10 00:58:08 +02:00
Bjoern Kerler 7191aa8b14 Fix signature command. Special response 0x9190 ? 2020-04-10 00:56:37 +02:00
Bjoern Kerler 3098a6bca0 Format PICC working 2020-04-10 00:36:15 +02:00
Bjoern Kerler 58af8c004d FormatPICC not working. Other things look good 2020-04-09 22:08:17 +02:00
Bjoern Kerler 68733cd7cf Minor fixes. Create AID and Delete AID working. 2020-04-09 20:03:59 +02:00
Bjoern Kerler 3b915d343b Add delete aid and minor fix 2020-04-09 19:51:35 +02:00
Bjoern Kerler b14dbf1997 Add fixes 2020-04-09 19:22:57 +02:00
Bjoern Kerler 2959f91fb6 Add file settings decoder 2020-04-09 19:15:17 +02:00
Bjoern Kerler 705cb9e18a Remove non-sense 2020-04-09 17:21:22 +02:00
Bjoern Kerler 057e611b6d Fix bugs, improve error reporting, add format picc and createapplication 2020-04-09 17:15:45 +02:00
Uli Heilmeier c96af80e44 Merge remote-tracking branch 'upstream/master' into hfmfdes-clang-warn 2020-04-09 14:39:46 +02:00
iceman1001 8f07ac80d1 fix: null 2020-04-09 13:28:43 +02:00
Uli Heilmeier dcede2f8e3 cmdhfmfdes: fix clang warnings 
Make clang happy and fix several
error: expression which evaluates to zero treated as a null pointer constant of type 'uint8_t *' (aka 'unsigned char *')
      [-Werror,-Wnon-literal-null-conversion]
and
cmdhfmfdes.c:732:31: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces]

Fixes RfidResearchGroup/proxmark3#659
 2020-04-09 13:26:43 +02:00
iceman1001 0904cce336 fix: null 2020-04-09 13:23:36 +02:00
Uli Heilmeier 43b5ee5918 legic.lua: updated to work again 
Fixed/changed things:

* added info that virtual tag is always MIM1024
* changed reading files to read binary files (as written by 'hf legic dump')
* changed extension for writing files (*.bin and *.eml) to be on par with 'hf legic dump'
* CRC was calculated wrong when data was not padded with 0 for one char hex strings
* readTag (rt) can now be called multiple times without using the wrong filename
* tag length was calculated wrong as segment header length field includes the header itself
* bytes are XORed before writing them to a tag
* default name for file contains now the tag id
 2020-04-09 10:24:58 +02:00
Bjoern Kerler 4128a98cdb
Merge pull request #19 from RfidResearchGroup/master 
Update
 2020-04-08 22:47:32 +02:00
Bjoern Kerler a3ea353dab Improve hf mfdes and cleanup 2020-04-08 22:44:51 +02:00
iceman1001 68a890d0e9 textual 2020-04-08 19:16:42 +02:00
iceman1001 df83c71470 chg: hf mfp info - need all data from getversion. Layout changes 2020-04-08 19:07:17 +02:00
iceman1001 f216fc7f5e chg: hf mfp info - need all data from getversion. Layout changes 2020-04-08 19:07:11 +02:00
iceman1001 133e2a6bc4 fix: 'hf mfp info' - now support GetVersion command (Plus EV1) 2020-04-08 17:13:05 +02:00
iceman1001 7643b24ca7 chg: 'hf mfp info' - colors and now checks originality for Plus EV1 2020-04-08 15:21:40 +02:00
iceman1001 cdf920b289 coverity fix 2020-04-08 14:18:21 +02:00
iceman1001 f870abf454 text 2020-04-08 13:59:20 +02:00
iceman1001 43936042e9 text 2020-04-08 13:49:18 +02:00
iceman1001 69b7d798c1 colors 2020-04-08 13:48:56 +02:00
iceman1001 285de43444 textual 2020-04-08 13:37:48 +02:00
iceman1001 0aa18f3008 add test command for developing desfire 2020-04-08 13:26:44 +02:00
iceman1001 a086754279 earlier test 2020-04-08 05:26:39 +02:00
iceman1001 e2370d7866 style 2020-04-08 05:03:19 +02:00
iceman1001 832770e3d9 chg: MIX 2020-04-08 05:02:57 +02:00
iceman1001 c7bbe9914e chg: use protocols.h for protocols defines 2020-04-08 05:02:41 +02:00
Iceman 743659aebf
Merge pull request #657 from bkerler/mfdes_auth 
Mifare Desfire DF Name display support and hf mfdes enum output improvement
 2020-04-08 04:36:47 +02:00
Bjoern Kerler 7085e3a3f1 Fix display of DF and minor bug 2020-04-07 21:52:59 +02:00
Bjoern Kerler 3833b8ee3b Add Mifare Desfire GetDFNames and improve HF MFDES Enum output 2020-04-07 21:30:12 +02:00
Uli Heilmeier 75943044a5 hf legic wrbl: fix Out-of-bounds check 
Check was off-by-one so that the last byte was not writable.
 2020-04-07 19:58:23 +02:00
Bjoern Kerler 61f3ef61de Fix issue #646 2020-04-07 18:27:46 +02:00
iceman1001 42063994e9 add: hf mfdes list 2020-04-07 09:23:34 +02:00
Bjoern Kerler f01c37aff4
Merge pull request #13 from RfidResearchGroup/master 
fix:  'trace list des' - now deals with wrapped native commands
 2020-04-07 09:18:35 +02:00
Bjoern Kerler 26975187ee Fix desfire aes authentification 2020-04-07 09:14:44 +02:00
iceman1001 ab8b9884a6 fix: 'trace list des' - now deals with wrapped native commands 2020-04-07 09:07:18 +02:00
iceman1001 53178e8b23 chg: hf mfdes enum - now get fileids and settings 2020-04-06 18:23:42 +02:00
Bjoern Kerler 1620a889f7 Log and Typos corrected 2020-04-06 16:26:01 +02:00
iceman1001 85c4f63015 chg: in preparation for EV3 2020-04-06 15:44:58 +02:00
iceman1001 3519dea0cf simpler 2020-04-06 15:25:56 +02:00
Bjoern Kerler 0bcc2a9025 Revert DropField commit 2020-04-06 15:14:16 +02:00
Bjoern Kerler 27ed590d73 Add DropField() when errors happen 2020-04-06 14:30:21 +02:00
Bjoern Kerler b4b56aa34f
Merge pull request #7 from bkerler/master 
Update
 2020-04-06 14:04:13 +02:00
Bjoern Kerler 50c6a9223d Add NTAG handling, fix TNP3xxx, remove ISO 14443-B card uids 2020-04-06 13:59:01 +02:00
iceman1001 b6e85c865d more settings emoji, hints. 2020-04-06 10:54:58 +02:00
Iceman 2427d1430e
Merge pull request #650 from mwalker33/Settings 
Settings Base
 2020-04-06 10:45:58 +02:00
Iceman d10f2b5a2a
Merge pull request #649 from bkerler/improve_14a_info 
Improve 14443-a info
 2020-04-06 10:44:44 +02:00
iceman1001 173583a548 fix coverity 278900 2020-04-06 09:46:22 +02:00
mwalker33 f0b0d10ee1 Comment out test calls 2020-04-06 16:36:12 +10:00
mwalker33 7b14fd7212 Code Clean 2020-04-06 16:20:57 +10:00
iceman1001 f461a4e5fb fix coverity 278907, 278906 2020-04-06 08:03:30 +02:00
iceman1001 fcf7bd24a6 fix coverity 278907, 278906 2020-04-06 08:02:48 +02:00
iceman1001 97ef641fad coverity fix, format specifier 2020-04-06 07:29:39 +02:00
iceman1001 b8bbc1d0a5 filename checks 2020-04-06 07:29:12 +02:00
iceman1001 97f06ddcfb coverity fixes 2020-04-06 07:15:34 +02:00
iceman1001 e1c64d3eef text 2020-04-06 06:56:23 +02:00
iceman1001 a32f1520db chg: hf legic eload/esave - always available 2020-04-06 06:55:51 +02:00
iceman1001 961eb193d1 text 2020-04-06 06:55:12 +02:00
iceman1001 227900efee eload/esave skeleton for cryptorf 2020-04-06 06:54:53 +02:00
iceman1001 5e9e6a9ad8 prepp hookup for cryptorf cmds 2020-04-06 06:17:05 +02:00
iceman1001 e0ff7d0338 cryptorf skeleton cmds -WIP- 2020-04-06 06:16:32 +02:00
iceman1001 4df7c3bf03 coverity fixes 2020-04-06 06:05:02 +02:00
Bjoern Kerler ca51fee02e Add ST uid infos 2020-04-06 00:00:53 +02:00
Bjoern Kerler e4187ef8a1
Merge pull request #5 from RfidResearchGroup/master 
Update
 2020-04-05 21:36:44 +02:00
Bjoern Kerler 25bcd6b89c Improve 14444-3a card detection 2020-04-05 21:33:41 +02:00
iceman1001 aa642d5d1e ax 2020-04-05 18:27:54 +02:00
iceman1001 0029f6fceb minor fixes. wrong params, helptext 2020-04-05 17:02:41 +02:00
iceman1001 0263273ec3 fix: wrong paramname 2020-04-05 17:00:16 +02:00
iceman1001 214bb46e9c fix: hf mfu ndef - ul ev1 48 bytes with a NDEF otp. e1101200, max size mismatch. Now it will select smallest 2020-04-05 16:59:14 +02:00
iceman1001 3a2723ac63 style 2020-04-05 14:53:32 +02:00
iceman1001 acfe18e7e9 rename to lower 2020-04-05 14:18:07 +02:00
Iceman 7e585eab6c
Merge pull request #647 from uhei/legic-clone 
Legic_clone.lua: Refactor to work with current command set
 2020-04-05 14:14:41 +02:00
Uli Heilmeier eac19be414 Legic_clone.lua: Adopt last command changes 2020-04-05 13:16:14 +02:00
Uli Heilmeier 16b14aa0e6 Legic_clone.lua: Refactor to work with current command set 
Refactored to work with current command set and MIM256 and MIM1024 tags
 2020-04-05 13:07:30 +02:00
iceman1001 175a5718b0 colors 2020-04-05 12:56:35 +02:00
iceman1001 2474385ab0 colors 2020-04-05 12:49:25 +02:00
iceman1001 95bc1230d7 colors 2020-04-05 12:41:38 +02:00
mwalker33 8fea6cddf7 Concept 2020-04-05 20:36:39 +10:00
iceman1001 2010f8db03 colors 2020-04-05 12:28:49 +02:00
iceman1001 3464dc2ebe helptext colors 2020-04-05 10:05:14 +02:00
iceman1001 7d9c0ebc91 text 2020-04-05 08:52:53 +02:00
iceman1001 33f94612eb color 2020-04-05 08:50:31 +02:00
iceman1001 79515b40b9 color 2020-04-05 08:50:16 +02:00
iceman1001 f13308783f textual @ikarus 2020-04-05 07:58:00 +02:00
Bjoern Kerler 99838b958e Minor fixes, styles adaption 2020-04-05 00:07:05 +02:00
Bjoern Kerler ee60aece68 Improve logging, fix key labels 2020-04-04 18:23:51 +02:00
iceman1001 00bd76e99d text, colors 2020-04-04 12:39:22 +02:00
iceman1001 34adf411c3 layout, text, colors - mfu info, 15 info 2020-04-04 12:17:55 +02:00
ikarus cf44a44575 fix: legic deobfuscate length. 2020-04-04 12:05:26 +02:00
iceman1001 4e3976bab1 textual 2020-04-04 07:22:03 +02:00
iceman1001 945bbe6311 fix: using the right sized param, helps.. 2020-04-04 07:03:30 +02:00
iceman1001 a4ce672d12 cmds list rearrange 2020-04-03 21:34:30 +02:00
iceman1001 260ae4ac19 chg: hf legic rdbl - short params now used. hf legic rdbl o 0 l 16 2020-04-03 21:30:11 +02:00
iceman1001 45223ee5d5 added obsfuscation optionally for dump/restore/eload/esave, consider it wip. As of byte 22. 2020-04-03 20:51:01 +02:00
iceman1001 e0d27d0ea3 remake of HF LEGIC commands input parameters, filename templates and renaming of commands in order to be unified across the client\nhf legic wrbl\nhf legic rdbl\nhf legic esave\nhf legic eload\n WIP, 2020-04-03 19:51:31 +02:00
iceman1001 1ac4c54d93 chg: 'hf legic dump' - now save BIN/EML/JSON, and uses new filename template. filename parameter is changed from O to F, to follow better client\n hf legic dump\n hf legic dump f mydump 2020-04-03 17:59:54 +02:00
iceman1001 24f2f1d341 Chg: 'hf topas reader' got split up into two, 'hf topaz info' which prints detailed information, and reader just prints UID. Now also prints NDEF 2020-04-03 17:39:10 +02:00
iceman1001 c819121d2b Chg: hf search - now continues to search, in case of dual tech cards. Thanks to @ikarus23 2020-04-03 17:37:46 +02:00
iceman1001 dfb3755db5 removed some test code 2020-04-03 14:07:32 +02:00
iceman1001 731e711e34 updated helptexts 2020-04-03 09:23:34 +02:00
iceman1001 0f662846f4 updated helptexts 2020-04-03 09:11:12 +02:00
iceman1001 98553439aa change 'hf iclass readtagfile' - improved param handling, better helptext, f filename s startblock e endblock 2020-04-03 08:36:55 +02:00
iceman1001 1b6164be07 change, sprint_hex no long has an extra space in the end. This will break some output designs 😄 2020-04-03 08:35:32 +02:00
iceman1001 3484cf1655 text and return codes 2020-04-03 07:22:54 +02:00
iceman1001 4418281284 chg: 'hf mfu ndef' - text record now correctly decode language and text parts. Thanks @bettse! 2020-04-02 21:16:28 +02:00
Iceman ae44e21f93
Merge pull request #634 from dunderhay/master 
Add colour to hf mf chk and fchk output
 2020-04-02 19:50:17 +02:00
merlokk 13d3b38eee byte order according to http://apps4android.org/nfc-specifications/NFCForum-TS-Type-2-Tag_1.1.pdf 
page 10,
sample: page 31
 2020-04-02 20:26:46 +03:00
merlokk 627499247f TLV ndef lock and memory control decoding 2020-04-02 20:21:51 +03:00
merlokk e64e5fb65c added some ndef tlv types 2020-04-02 18:42:44 +03:00
Daniel Underhay f0ffe79569 Add colour to hf mf chk and fchk output 2020-04-03 00:14:15 +11:00
iceman1001 16110985ca text 2020-04-02 09:34:52 +02:00
iceman1001 47d43cfc56 text 2020-04-02 09:34:03 +02:00
iceman1001 61e59fa913 fix: 'hf mfu ndef - sig2 uses wrong index 2020-04-02 09:25:04 +02:00
iceman1001 3b4d5b5676 remove dublicate 2020-04-02 08:25:24 +02:00
iceman1001 b91c4977af textual 2020-04-02 08:14:31 +02:00
iceman1001 761860656e more pulic keys (@anon) 2020-04-02 08:09:18 +02:00
iceman1001 1bb9b2b112 chg: fixed the h param in filename became help bug 2020-04-02 07:55:35 +02:00
iceman1001 0c7ae02da4 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-02 06:39:40 +02:00
iceman1001 d67c55cd2a entries from taginfo app\n removed duplicates 2020-04-02 06:38:45 +02:00
iceman1001 cc6fda9b75 added checks for unknown public keys 2020-04-01 15:54:59 +02:00
iceman1001 07d16bba51 added some more originality keys 2020-04-01 15:10:50 +02:00
iceman1001 3f54fdf252 textual 2020-04-01 09:49:11 +02:00
iceman1001 b0a76d5f02 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-01 09:28:14 +02:00
iceman1001 d633340a1a Chg: 'data ndef' - cleaner output if called with no hex 2020-04-01 09:26:39 +02:00
iceman1001 83e92c6455 Add: 'hf mfu ndef' - read and parse NDEF type2 records 2020-04-01 09:25:54 +02:00
merlokk 737ebf9ab8 ndef signature1 length fix 2020-03-31 19:26:09 +03:00
merlokk 6d3c13c49a fix mfp behavior in info command 2020-03-31 19:13:03 +03:00
merlokk 5b9c51fb7e signature decode r and s works 2020-03-31 18:30:44 +03:00
merlokk 38004f9db5 decode works 2020-03-31 18:25:17 +03:00
merlokk 74243fcb03 signatures v1 and v2 2020-03-31 18:09:41 +03:00
iceman1001 8dd19a00c5 support v2.0 ndef sigs 2020-03-31 16:11:01 +02:00
iceman1001 5618f71ac7 textual 2020-03-31 15:56:34 +02:00
iceman1001 160f150dce fixing NDEF 2020-03-31 15:47:33 +02:00
iceman1001 6eb36c5438 added new command 'data ndef' - for easy decoding of NDEF messages inside pm3 client 2020-03-31 15:33:07 +02:00
iceman1001 e13a25902f added more sigs 2020-03-31 08:11:27 +02:00
iceman1001 978dde98a9 added more sigs 2020-03-31 08:06:45 +02:00
iceman1001 8eef5d188c fix coverity 226432 2020-03-30 22:25:00 +02:00
iceman1001 4178017536 chg: hf legic dump - change filename template 2020-03-30 15:18:25 +02:00
Iceman a1ae0523ac
Merge pull request #626 from Windslab/patch-1 
textual
 2020-03-29 07:53:13 +02:00
iceman1001 a79a11256a revert 2020-03-29 07:48:01 +02:00
Winds 9356549bc6
textual 
Correcting a script name
 2020-03-28 18:23:05 +03:00
iceman1001 82d99522b4 textual 2020-03-27 11:56:47 +01:00
iceman1001 ffb8ad9873 defaults 2020-03-26 21:04:58 +01:00
iceman1001 063b393eba textual 2020-03-26 20:36:38 +01:00
iceman1001 a9571d26b0 fix coverity 274113 2020-03-25 16:49:19 +01:00
iceman1001 6e49d94a82 fix coverity 205241 2020-03-25 16:35:31 +01:00
iceman1001 19a43d4726 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-03-25 11:20:47 +01:00
iceman1001 dc4bd2c1f7 fix: bizarr behavior in Proxspace lua, where io.read("*l") default behavior swaps to io.read("*L") . So lets make *L default a strip away all newlines... 2020-03-25 11:20:35 +01:00
iceman1001 0c25f85c9f empty string. 2020-03-25 11:19:20 +01:00
Iceman 04715cb2ea
Merge pull request #624 from darconeous/patch-1 
Updates to the Tesla AIDs
 2020-03-24 17:20:26 +01:00
Robert Quattlebaum f593efebf4
Re-added teslaStore AID, also added TeslaDAP AID 2020-03-24 09:18:16 -07:00
iceman1001 0033715a59 cppchecker 2020-03-24 13:35:33 +01:00
iceman1001 10243d9bce cppchecker - too many shifts 2020-03-24 13:16:47 +01:00
iceman1001 5acd681f8f cppchecker - too many shifts 2020-03-24 13:11:50 +01:00
iceman1001 0fbf7d6328 cppchecker - shadow 2020-03-24 13:06:09 +01:00
iceman1001 a8aadb2751 cppchecker missing includes 2020-03-24 11:45:57 +01:00
iceman1001 f5a8b0601b fix: coverity 274220 2020-03-24 11:33:52 +01:00
iceman1001 4f78edff31 textual 2020-03-24 11:31:23 +01:00
iceman1001 1e37c57729 chg: hf mfdes info - adapted to support multiple keys 2020-03-24 09:50:17 +01:00
Robert Quattlebaum bc6de92771
Updates to the Tesla AIDs 
Now includes the AIDs that are used in the key fob and phone.
Removed some AIDs that can't be selected.
 2020-03-23 21:32:20 -07:00
BarikMana d6f6f81094
Bosch Solution 6000 Key Sector 0 Key A&B 
Works with any Bosch Solution 6000 PR11xB reader.
 2020-03-22 23:44:06 +09:00
Iceman e255571a02
Merge pull request #620 from mwalker33/Keri-MS 
Keri ms clone support with fc and cardid
 2020-03-22 08:54:24 +01:00
iceman1001 8319b18bc7 chg: hf mf sim - adapt number of sectors to print on type 2020-03-22 08:10:10 +01:00
mwalker33 1df6782312 Update cmdlfkeri.c 
Card ID change to CN/Card Number
 2020-03-22 17:47:35 +11:00
mwalker33 dfe36a2d60 Update cmdlfkeri.c 
Code clean and tune
 2020-03-22 11:55:38 +11:00
iceman1001 fc1c133c46 fix: script hf_bruteforce - ensure zeropadding 2020-03-21 23:13:41 +01:00
iceman1001 64e027faf7 chg: unify dump file template used in this repo. hf-mf-(uid)-dump.(bin/eml/json) is the prefeered style. 2020-03-21 20:58:20 +01:00
iceman1001 dd3bd72af4 chg: 'hf 15 dump' - add basic json format when saving\nchg: 'hf 15 restore' - match file template to hf-(tyoe)-(uid)-dump.(extension) 2020-03-21 20:38:58 +01:00
iceman1001 5ceb83673f save json, added basic support for 14b/15/t555/legic 2020-03-21 20:34:57 +01:00
iceman1001 7e97062381 change for bionic only to zero out if set 2020-03-21 20:18:42 +01:00
iceman1001 9a2fc52a92 closing files are use... 2020-03-21 12:40:16 +01:00
iceman1001 80f79b1066 swap to live execution 2020-03-21 12:37:40 +01:00
iceman1001 e80eb37b5e more rework 2020-03-21 12:34:58 +01:00
mwalker33 4175297f57 Update cmdlfkeri.c 
help update
 2020-03-21 21:42:00 +11:00
mwalker33 6440f4c5b0 Update cmdlfkeri.c 2020-03-21 21:36:37 +11:00
mwalker33 3125812f93 Update cmdlfkeri.c 
Added clone for FC and CardID
 2020-03-21 20:08:11 +11:00
iceman1001 4443ae5500 rework script 2020-03-21 10:04:03 +01:00
iceman1001 19aa618fbd keys 2020-03-21 10:03:36 +01:00
Iceman 8ee03cb5e6
Merge pull request #615 from mwalker33/Keri-MS 
Update cmdlfkeri.c
 2020-03-21 09:42:29 +01:00
mwalker33 d870b52d7b Update cmdlfkeri.c 2020-03-21 13:37:33 +11:00
iceman1001 be3932d3c0 textual 2020-03-19 12:05:48 +01:00
iceman1001 7a1c65d1af chg: hf mfdes info - refactored a bit. \nchg: hf mfdes enum - now works again 2020-03-19 12:05:29 +01:00
Iceman b4cc0119d8
Merge pull request #612 from Windslab/master 
Create hf-writer.lua
 2020-03-19 11:25:10 +01:00
Winds 4bbe0827f5 Update hf-writer.lua 
Add the possibility for a -h helptext param
 2020-03-19 12:29:39 +03:00
iceman1001 37011158e1 chg: hf mfp info - more text / better detection between DESFire and Plus 2020-03-19 09:26:56 +01:00
iceman1001 3947528996 optional color for serial text in prompt 2020-03-19 05:44:47 +01:00
Winds 6b30e1ab00 Update hf-writer.lua 
Adapted your script to the coding standards
 2020-03-18 13:39:10 +03:00
iceman1001 eab2ebafae added pwdgen test 2020-03-17 17:12:27 +01:00
iceman1001 6783986fca hf mfdes info - textual 2020-03-17 13:41:46 +01:00
iceman1001 53d00dc7c3 whitespace 2020-03-17 13:40:28 +01:00
iceman1001 e9b293e8e9 hf mfp info - textual / colours 2020-03-17 13:38:51 +01:00
Winds 9ff3ed2933 Create hf-writer.lua 2020-03-17 13:37:38 +03:00
iceman1001 fe0d9c8d9f hf mfdes enum - fixes WIP 2020-03-17 11:37:38 +01:00
iceman1001 8cf88c5cd5 hf mfdes info - textual 2020-03-17 02:30:25 +01:00
Marlin Sööse 6d7682fdb3
Update mfc_default_keys.dic 2020-03-16 21:04:46 -04:00
iceman1001 1cb495e40b add desfire light signature verification check 2020-03-17 01:50:27 +01:00
iceman1001 7a7a3d014e hf mfdes info - remake to work with Desfire Light. Switch to apdu framing. WIP 2020-03-16 21:51:45 +01:00
iceman1001 8341309754 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-03-16 21:45:40 +01:00
iceman1001 3fa86bf80b iceman needs his coffee 2020-03-16 21:45:17 +01:00
Philippe Teuwen 0a616d61f7 less emoji 2020-03-16 21:45:08 +01:00
Philippe Teuwen c769d661f1 emoji -> alttext in logfiles 2020-03-16 21:34:42 +01:00
iceman1001 9f787faea6 remove var 2020-03-16 18:43:24 +01:00
iceman1001 82077b2f1c hint now uses session struct, in preperation for a preference file. 2020-03-16 18:42:34 +01:00
Philippe Teuwen 9ebfe0908f Prevent emoji on ProxSpace 2020-03-16 18:14:31 +01:00
Iceman 0923a8c625
Merge pull request #608 from RfidResearchGroup/emojis 
emojis support
 2020-03-16 10:42:24 +01:00
Philippe Teuwen 5e3c070ab9 emojis support 2020-03-16 00:23:11 +01:00
Daniel Underhay 4a8a0eca98 Additional colour changes 2020-03-16 00:02:18 +11:00
Daniel Underhay bff380ad9c Merge remote-tracking branch 'upstream/master' 2020-03-15 23:56:55 +11:00
Daniel Underhay eb99a09d47 Change mf card type colour from green to yellow 2020-03-15 23:52:05 +11:00
iceman1001 e5b38c46c6 chg: hints - allow ON/OFF 2020-03-15 13:48:50 +01:00
Daniel Underhay daba356871 Add colour to hf mfdes command 2020-03-15 23:36:44 +11:00
iceman1001 fb3f4ecd36 update hint loglevel 2020-03-15 13:29:00 +01:00
iceman1001 3f81573878 update hint loglevel 2020-03-15 13:28:39 +01:00
iceman1001 3cf06cf478 update hint loglevel 2020-03-15 13:27:43 +01:00
iceman1001 3e11d8d522 update hint loglevel 2020-03-15 13:26:15 +01:00
iceman1001 8387bdbdad change hint loglevel 2020-03-15 13:23:02 +01:00
iceman1001 7d2e65ce91 forgot a hint part 2020-03-15 11:52:13 +01:00
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