Commit graph

8642 commits

Author SHA1 Message Date
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
Iceman 42a987903f
Merge pull request #672 from mwalker33/hf-mf
Key table fix - remove extra space
2020-04-12 10:38:25 +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
mwalker33 b6b5c31c7e
Merge pull request #34 from RfidResearchGroup/master
Update Master
2020-04-12 17:45:15 +10: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
mwalker33 449d2ac1ec
Merge pull request #33 from RfidResearchGroup/master
Update
2020-04-11 16:32:44 +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 63c7710976 Fix 2k3 key handling 2020-04-11 03:05:46 +02:00
Bjoern Kerler 6afc8d39a4 Add 2k3 des iso support preparation 2020-04-11 02:56:48 +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 fceae52e68 Add 3K3 basic support 2020-04-11 01:39:24 +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 cd698ea3ee Merge branch 'authtest' of https://github.com/bkerler/proxmark3 into authtest 2020-04-10 23:03:52 +02:00
Bjoern Kerler e0338284c0 Add changelog 2020-04-10 23:03:31 +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 6bd5cda49c setting a standalone mode when copying this file by default 2020-04-10 10:44:15 +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
iceman1001 732c012be7 adjustments 2020-04-10 10:27:28 +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
Iceman 652bf0c94b
Merge pull request #664 from bkerler/mfdes_test
HF MFDES updates. New aid create, aid delete and format card command. Auth fixed. Improved logging.
2020-04-10 06:32:27 +02: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