RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-22 08:16:16 +08:00
Code Issues Packages Projects Releases Wiki Activity
8744 commits 3 branches 14 tags 86 MiB
Commit graph

8744 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 7d1ef452b9 update gitignore 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
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
Philippe Teuwen 367ae694d9 clarify homebrew instructions 2020-04-16 21:25:30 +02:00
iceman1001 c2f4b18add chg: updated gitignore file to match new folder structure 2020-04-16 16:53:28 +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
iceman1001 914316d194 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-16 14:16:24 +02:00
Philippe Teuwen 315cda0754
Merge pull request #692 from kalekume/patch-2 
Added new AID F001D0
 2020-04-16 11:58:35 +02:00
iceman1001 d55c34e378 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2020-04-16 11:56:25 +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
iceman1001 c6473afcc1 text 2020-04-16 09:53:31 +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