RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-13 08:41:34 +08:00
Code Issues Projects Releases Packages Wiki Activity
9366 commits 3 branches 15 tags 88 MiB
Commit graph

5819 commits

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