RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-13 16:43:26 +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
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 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 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 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 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:
2020-04-13 12:56:36 +02:00
Iceman
ced45cf865
Merge pull request 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 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 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 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 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 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 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 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 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 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
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 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 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 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 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 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 from mwalker33/Settings 
Settings Base
 2020-04-06 10:45:58 +02:00
Iceman
d10f2b5a2a
Merge pull request 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 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 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 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 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 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 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 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 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 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