RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-07 08:38:35 +08:00
Code Issues Projects Releases Packages Wiki Activity
9101 commits 3 branches 15 tags 87 MiB
Commit graph

5668 commits

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