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

5625 commits

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