Commit Graph

  • cda08d2c9e Fix Makefile. Revert hardnested changes Bjoern Kerler 2020-04-15 14:19:27 +02:00
  • 7da544ab18
    Merge pull request #29 from RfidResearchGroup/master Bjoern Kerler 2020-04-15 14:13:45 +02:00
  • f2945e8567
    Merge pull request #689 from netvader/patch-4 Iceman 2020-04-15 09:58:37 +02:00
  • 6ad5c1f872
    Update aid_desfire.json netvader 2020-04-15 09:55:55 +02:00
  • a50b58a50b
    Merge pull request #38 from RfidResearchGroup/master mwalker33 2020-04-15 17:50:12 +10:00
  • 4a7d2838ec
    Merge pull request #688 from mwalker33/Settings-2 Iceman 2020-04-15 09:47:28 +02:00
  • bdc4aae6a6 Typo mwalker33 2020-04-15 17:42:11 +10:00
  • 5c511d35a9
    Merge pull request #687 from mwalker33/Settings-2 Iceman 2020-04-15 09:34:51 +02:00
  • 5545219f82 Update Full Path mwalker33 2020-04-15 16:40:28 +10:00
  • 71e1c5e53b added more DESFire aids iceman1001 2020-04-15 07:56:55 +02:00
  • c9a03cf27f First Cmake test Bjoern Kerler 2020-04-14 22:26:22 +02:00
  • f1f0e277b8
    Merge pull request #685 from eybisi/master Iceman 2020-04-14 22:03:15 +02:00
  • 23a0a6ece8
    Merge branch 'master' into master Iceman 2020-04-14 22:03:04 +02:00
  • 1defeeb400
    Merge pull request #684 from uhei/mfdes-aid Iceman 2020-04-14 22:01:52 +02:00
  • 169d788fe9
    add istanbulkart aid Ahmet Bilal Can 2020-04-14 22:32:00 +03:00
  • d67af053fc AID Desfire: Add clipper card Uli Heilmeier 2020-04-14 21:27:41 +02:00
  • 1f4180ed04
    Merge pull request #28 from RfidResearchGroup/master Bjoern Kerler 2020-04-14 20:42:31 +02:00
  • 054f28e783 fix #682 - hf mf sim - not working good with MCT Tool app. Actually it didnt work at all iceman1001 2020-04-14 16:18:14 +02:00
  • 0b43252a02 Test code for full path mwalker33 2020-04-14 19:17:00 +10:00
  • 7ee49df717 Chg: updates from whereami repo. I am sure I broke something now iceman1001 2020-04-14 09:24:08 +02:00
  • 0eb303c152
    Merge pull request #680 from bkerler/Auth_Impl Iceman 2020-04-14 07:07:59 +02:00
  • 5fc922f6f9 Add Key display on enum Bjoern Kerler 2020-04-14 00:35:22 +02:00
  • 4cd426dd04 Changelog Bjoern Kerler 2020-04-14 00:01:02 +02:00
  • a1976fd6fe
    Merge pull request #37 from RfidResearchGroup/master mwalker33 2020-04-14 07:56:17 +10:00
  • 5c4148ec15 Fixes after pull Bjoern Kerler 2020-04-13 23:56:04 +02:00
  • 0ff31a9fa8 changes Bjoern Kerler 2020-04-13 23:54:05 +02:00
  • 49f93cbbd0 Implement several commands Bjoern Kerler 2020-04-13 23:50:05 +02:00
  • 49565659ed
    Merge pull request #27 from RfidResearchGroup/master Bjoern Kerler 2020-04-13 23:49:27 +02:00
  • abfcb524b5 minor coverity fixes iceman1001 2020-04-13 14:47:36 +02:00
  • ba926addfb
    Merge pull request #679 from uhei/clang-warn3 Iceman 2020-04-13 14:25:48 +02:00
  • dc002d224a cmdhfmfdes: Fix clang tautological-pointer-compare warning Uli Heilmeier 2020-04-13 12:56:36 +02:00
  • ced45cf865
    Merge pull request #678 from mwalker33/Settings-2 Iceman 2020-04-13 12:50:10 +02:00
  • fd5fe61462 getwd fix mwalker33 2020-04-13 20:46:01 +10:00
  • e1c65296a3
    Merge pull request #677 from mwalker33/Settings-2 Iceman 2020-04-13 12:34:42 +02:00
  • acf4c09aa3 Update proxguiqt.h mwalker33 2020-04-13 19:43:15 +10:00
  • dded69c989 Update proxmark3.c mwalker33 2020-04-13 19:35:19 +10:00
  • 3b4f851d2d tweak save mwalker33 2020-04-13 16:17:57 +10:00
  • 9f5a5132bc
    Merge pull request #674 from bkerler/Auth_Impl Iceman 2020-04-13 07:09:54 +02:00
  • 0cc2bda952 Update preferences.c mwalker33 2020-04-13 14:39:16 +10:00
  • 82bbea3874 Update preferences.c mwalker33 2020-04-13 14:12:54 +10:00
  • c924e2d589 save on exit mwalker33 2020-04-13 13:51:03 +10:00
  • b72123a093 Update preferences.c mwalker33 2020-04-13 12:44:34 +10:00
  • 0b360d4dc0 Preference commands rework mwalker33 2020-04-13 12:12:47 +10:00
  • 69eef755d3 Window Size/Pos Tracking mwalker33 2020-04-13 09:32:47 +10:00
  • 9c4cf973ab NONE is NULL Bjoern Kerler 2020-04-13 01:26:44 +02:00
  • 95113a897b Merge branch 'Auth_Impl' of https://github.com/bkerler/proxmark3 into Auth_Impl Bjoern Kerler 2020-04-13 01:22:48 +02:00
  • 27798aaeb3 Changelog Bjoern Kerler 2020-04-13 01:22:42 +02:00
  • da710e257c
    Merge pull request #26 from RfidResearchGroup/master Bjoern Kerler 2020-04-13 01:21:27 +02:00
  • e543637897 PICC Format fixes Bjoern Kerler 2020-04-13 01:19:26 +02:00
  • f7c40e83bd Make style Bjoern Kerler 2020-04-13 01:00:06 +02:00
  • 30a044445a Add mifare desfire CreateStdDataFile Bjoern Kerler 2020-04-13 00:59:01 +02:00
  • 02165e081f
    Merge pull request #673 from bkerler/Auth_Impl Iceman 2020-04-12 21:51:29 +02:00
  • d309a1218a Changelog Bjoern Kerler 2020-04-12 21:44:59 +02:00
  • 11ca483617
    Merge pull request #25 from RfidResearchGroup/master Bjoern Kerler 2020-04-12 21:29:33 +02:00
  • 99d7a0a1c9 chg: hf mfu ndef - better message when failed to find a mfu tag iceman1001 2020-04-12 21:27:32 +02:00
  • 4cc6d3858d fix: no error message when para was zero iceman1001 2020-04-12 21:23:52 +02:00
  • b90539f2f0 Port des on client to mbedtls_des Bjoern Kerler 2020-04-12 21:02:15 +02:00
  • f234c34d1c Update Bjoern Kerler 2020-04-12 20:59:27 +02:00
  • 4501805709 Port des on device to mbedtls_des Bjoern Kerler 2020-04-12 20:58:41 +02:00
  • c06864dcc7 Rename due to name conflict Bjoern Kerler 2020-04-12 18:09:14 +02:00
  • 309ec0d942 Fixes Bjoern Kerler 2020-04-12 17:59:46 +02:00
  • 44e9d13d1a Make style Bjoern Kerler 2020-04-12 17:41:36 +02:00
  • f76de40982 Rework auth for client and device Bjoern Kerler 2020-04-12 17:39:11 +02:00
  • b0af460a6e
    Merge pull request #24 from bkerler/master Bjoern Kerler 2020-04-12 17:11:47 +02:00
  • 7aa27cfefb Auth of des, 3des and aes working. Bjoern Kerler 2020-04-12 17:10:27 +02:00
  • 202b50f216
    Merge pull request #23 from RfidResearchGroup/master Bjoern Kerler 2020-04-12 17:07:39 +02:00
  • 4177f51770 Update proxguiqt.cpp mwalker33 2020-04-12 20:59:18 +10:00
  • ce38dd92ba Update proxguiqt.cpp mwalker33 2020-04-12 20:42:10 +10:00
  • 87e58442fb Update proxguiqt.cpp mwalker33 2020-04-12 20:36:05 +10:00
  • 7fa8587dd2 Plot Windows Move Realtime mwalker33 2020-04-12 20:24:56 +10:00
  • 5df9d3d8f7 fix mwalker33 2020-04-12 19:49:17 +10:00
  • 682bded18a starting with a application id file for desfire, for known application id:s. iceman1001 2020-04-12 11:14:10 +02:00
  • 3454076901 chg: make which key to use more promenent iceman1001 2020-04-12 11:07:20 +02:00
  • 3cae25aa87 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 iceman1001 2020-04-12 10:56:39 +02:00
  • 487f359f6b
    Merge pull request #36 from mwalker33/master mwalker33 2020-04-12 18:53:00 +10:00
  • f200188310
    Merge pull request #35 from RfidResearchGroup/master mwalker33 2020-04-12 18:51:31 +10:00
  • 42a987903f
    Merge pull request #672 from mwalker33/hf-mf Iceman 2020-04-12 10:38:25 +02:00
  • 6d08936f04 Update cmdhfmf.c mwalker33 2020-04-12 17:56:29 +10:00
  • 2476ce509b Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 iceman1001 2020-04-12 09:55:46 +02:00
  • b6b5c31c7e
    Merge pull request #34 from RfidResearchGroup/master mwalker33 2020-04-12 17:45:15 +10:00
  • 04f8adbf32
    Merge pull request #671 from mwalker33/Settings-2 Iceman 2020-04-12 09:06:51 +02:00
  • ac8c139867 Update preferences.c mwalker33 2020-04-12 13:08:02 +10:00
  • c9bd43c4b6 Edit and Updates mwalker33 2020-04-12 13:07:25 +10:00
  • 309020c64c more error messages when failing parsing iceman1001 2020-04-11 20:41:05 +02:00
  • fab3c59d25 cmdhfmfdes: fix clang warning Uli Heilmeier 2020-04-11 13:27:38 +02:00
  • de0768fadc
    Merge pull request #669 from bkerler/authtest Iceman 2020-04-11 13:26:14 +02:00
  • 0c407504b3 Fix file ids handling Bjoern Kerler 2020-04-11 13:14:16 +02:00
  • b387196cf2
    Merge pull request #666 from bkerler/authtest Iceman 2020-04-11 11:52:09 +02:00
  • 637103224d Fixes Bjoern Kerler 2020-04-11 11:32:31 +02:00
  • 1900f6b16a Overlay mwalker33 2020-04-11 17:26:43 +10:00
  • 449d2ac1ec
    Merge pull request #33 from RfidResearchGroup/master mwalker33 2020-04-11 16:32:44 +10:00
  • b643c70f0d
    Merge pull request #668 from mwalker33/Settings-2 Iceman 2020-04-11 07:40:46 +02:00
  • f71e7438f7 Improve DecodeFileSettings log Bjoern Kerler 2020-04-11 03:10:02 +02:00
  • 63c7710976 Fix 2k3 key handling Bjoern Kerler 2020-04-11 03:05:46 +02:00
  • 6afc8d39a4 Add 2k3 des iso support preparation Bjoern Kerler 2020-04-11 02:56:48 +02:00
  • 37aa19ad6c Add 2k3 des iso support preparation Bjoern Kerler 2020-04-11 02:56:08 +02:00
  • 4c2f98ac3d Add first 3K3 support. Improve algo error handling Bjoern Kerler 2020-04-11 02:32:55 +02:00
  • 9b26fab1c2 Further auth info fixes Bjoern Kerler 2020-04-11 01:41:39 +02:00
  • fceae52e68 Add 3K3 basic support Bjoern Kerler 2020-04-11 01:39:24 +02:00
  • 327d8a8bfe Further aid and auth info fixes Bjoern Kerler 2020-04-11 01:38:47 +02:00