Commit graph

9075 commits

Author SHA1 Message Date
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 95113a897b Merge branch 'Auth_Impl' of https://github.com/bkerler/proxmark3 into Auth_Impl 2020-04-13 01:22:48 +02:00
Bjoern Kerler 27798aaeb3 Changelog 2020-04-13 01:22:42 +02:00
Bjoern Kerler da710e257c
Merge pull request #26 from RfidResearchGroup/master
Merge pull request #673 from bkerler/Auth_Impl
2020-04-13 01:21:27 +02:00
Bjoern Kerler e543637897 PICC Format fixes 2020-04-13 01:19:26 +02:00
Bjoern Kerler f7c40e83bd Make style 2020-04-13 01:00:06 +02:00
Bjoern Kerler 30a044445a Add mifare desfire CreateStdDataFile 2020-04-13 00:59:01 +02:00
Iceman 02165e081f
Merge pull request #673 from bkerler/Auth_Impl
Fix des/3des/3k3des/aes auth. Add auth to both client and device. Move to mbedtls crypt.
2020-04-12 21:51:29 +02:00
Bjoern Kerler d309a1218a Changelog 2020-04-12 21:44:59 +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 4501805709 Port des on device to mbedtls_des 2020-04-12 20:58:41 +02:00
Bjoern Kerler c06864dcc7 Rename due to name conflict 2020-04-12 18:09:14 +02:00
Bjoern Kerler 309ec0d942 Fixes 2020-04-12 17:59:46 +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
Bjoern Kerler 202b50f216
Merge pull request #23 from RfidResearchGroup/master
Update
2020-04-12 17:07:39 +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 487f359f6b
Merge pull request #36 from mwalker33/master
Update
2020-04-12 18:53:00 +10:00
mwalker33 f200188310
Merge pull request #35 from RfidResearchGroup/master
Update
2020-04-12 18:51:31 +10: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