Commit graph

5567 commits

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