Commit graph

8714 commits

Author SHA1 Message Date
Bjoern Kerler
81bc0bc2b9 Reorder client src directories 2020-04-16 10:53:24 +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
Iceman
f2945e8567
Merge pull request #689 from netvader/patch-4
Update aid_desfire.json
2020-04-15 09:58:37 +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
f1f0e277b8
Merge pull request #685 from eybisi/master
add istanbulkart aid
2020-04-14 22:03:15 +02:00
Iceman
23a0a6ece8
Merge branch 'master' into master 2020-04-14 22:03:04 +02:00
Iceman
1defeeb400
Merge pull request #684 from uhei/mfdes-aid
AID Desfire: Add clipper card
2020-04-14 22:01:52 +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
iceman1001
054f28e783 fix #682 - hf mf sim - not working good with MCT Tool app. Actually it didnt work at all 2020-04-14 16:18:14 +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
Iceman
0eb303c152
Merge pull request #680 from bkerler/Auth_Impl
Mifare Desfire functionality update (Read/Write/Clear files) and fixes
2020-04-14 07:07:59 +02:00
Bjoern Kerler
5fc922f6f9 Add Key display on enum 2020-04-14 00:35:22 +02:00
Bjoern Kerler
4cd426dd04 Changelog 2020-04-14 00:01:02 +02:00
mwalker33
a1976fd6fe
Merge pull request #37 from RfidResearchGroup/master
Update
2020-04-14 07:56:17 +10: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
Bjoern Kerler
49565659ed
Merge pull request #27 from RfidResearchGroup/master
Update
2020-04-13 23:49:27 +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
Iceman
9f5a5132bc
Merge pull request #674 from bkerler/Auth_Impl
hf mfdes createstdfile command and formatpicc fixes
2020-04-13 07:09:54 +02: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
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