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

9438 commits

Author SHA1 Message Date
Matt Moran a6280e2978 Merge remote-tracking branch 'upstream/master' into feat/hf-gallagher-remove-aid-limits 2022-01-15 12:11:12 +13:00
Philippe Teuwen 327231b060 license 2022-01-14 21:22:26 +01:00
Philippe Teuwen 1d05eebd28 emoji update 2022-01-14 21:08:14 +01:00
Philippe Teuwen 1f0e59148d atr update 2022-01-14 20:58:56 +01:00
Philippe Teuwen 08719839b5 remove unused src files prng.c and tea.c 
Note that there is a clean public domain implementation of tea on wikipedia...
 2022-01-14 18:09:39 +01:00
merlokk 41b273e9f7 added mode for delete file 2022-01-13 17:07:34 +02:00
Matt Moran aa6b74a08d Fix was attempting to credential file when --noappcreate was passed 2022-01-13 21:06:21 +13:00
Philippe Teuwen fc13b6b20c Add pm3line API to hide readline, allowing easier implementation of alternatives 2022-01-11 23:13:22 +01:00
iceman1001 1731695483 Revert "Release v4.14831 - Frostbit" 
This reverts commit 0b65f2bc9e.
 2022-01-11 19:17:19 +01:00
iceman1001 0b65f2bc9e Release v4.14831 - Frostbit 2022-01-11 19:17:19 +01:00
Philippe Teuwen 4b7a8f02d4 fix 'lf ti demod' segfault 2022-01-11 15:06:22 +01:00
iceman1001 8d5f31757f avoid printing null items 2022-01-11 10:59:22 +01:00
iceman1001 5f9d8273e6 fix outofbounds 2022-01-11 10:54:14 +01:00
iceman1001 c754122a74 coverity fix CID #370724 2022-01-11 08:56:59 +01:00
Philippe Teuwen 105d5334db make style to remove zx 2022-01-11 02:15:54 +01:00
Philippe Teuwen 65cc181307 update license header 2022-01-11 00:38:10 +01:00
iceman1001 caf9f07c7a fix lf hid brute param for format 2022-01-10 22:41:02 +01:00
iceman1001 221a06321b cppcheck fix - array out of bounds. last item is null reduce 1 from arr len, zero based index reduce -1 to get index....\n also made the compare caseinsensitive 2022-01-10 22:29:57 +01:00
Philippe Teuwen 21061d6d55 Removing client/android library cmake, not needed anymore 2022-01-10 10:27:39 +01:00
Philippe Teuwen bb098c4eab Disable zx for the release as it's still WIP 2022-01-09 14:46:28 +01:00
Philippe Teuwen 2269ad6914 Remove ARRAY_LENGTH, we've already ARRAYLEN 2022-01-09 14:19:48 +01:00
Philippe Teuwen 5a4584358c make style 2022-01-09 14:10:26 +01:00
iceman1001 4b0096c135 cppcheck complains about the dynamic_lock_Areas access. Might fix it 2022-01-09 13:40:58 +01:00
iceman1001 073b47d480 fix to handle when first_byte_sum does not find a match in the possible sums array. ie, leads to a crash 2022-01-09 13:39:37 +01:00
iceman1001 0967ea1989 modified the default mfc hardcoded list to contain some more keys 2022-01-09 13:37:35 +01:00
iceman1001 28efc8b097 hf mf darkside - textual adaptation to current style 2022-01-09 13:36:29 +01:00
iceman1001 abacf673dc cppcheck fixes 2022-01-09 13:35:16 +01:00
iceman1001 0942ce7a68 refactory parity files a bit 2022-01-09 13:34:54 +01:00
iceman1001 61c9252e15 calloc 2022-01-09 00:35:43 +01:00
iceman1001 fe9348768d use calloc instead 2022-01-09 00:33:33 +01:00
iceman1001 0254b2a63a cppcheck fixes 2022-01-08 15:29:11 +01:00
iceman1001 5ff043e5ab null key fix 2022-01-08 15:28:36 +01:00
iceman1001 0a5ae04070 coverity fixes 2022-01-08 13:27:22 +01:00
iceman1001 eaf968092c coverity fixes 2022-01-08 13:14:53 +01:00
iceman1001 256565f820 coverity fixes for mem leaks. added a macro for freeing cliparser context too 2022-01-08 13:08:51 +01:00
iceman1001 8cd19d7c87 textual / style 2022-01-08 13:01:10 +01:00
Philippe Teuwen 291a4a4aa2 silent clang warning on increasing required alignment 2022-01-08 12:15:24 +01:00
Philippe Teuwen 5a0dda6bb0 Make HFGAL_* macros available to all as PM3_* macros 2022-01-08 12:00:54 +01:00
Matt Moran cb6a1db852 Continue reading credentials if one fails (e.g. when using different site keys) 2022-01-08 18:13:29 +13:00
Philippe Teuwen 30aa7aa7d1 Adapting license headers, WIP 2022-01-08 00:40:52 +01:00
iceman1001 a432b49393 change gprox ii clone/sim to handle 20b cardnumber for the 36b format 2022-01-07 21:06:07 +01:00
iceman1001 89a05b47a8 cppcheck fixes const 2022-01-07 19:31:19 +01:00
iceman1001 2bf2bb301a cppcheck fixes 2022-01-07 19:23:42 +01:00
iceman1001 a8ccba77d6 cppcheck fixes const 2022-01-07 19:13:24 +01:00
Matt Moran 1f8217ec2e Use DesfireGetAIDList to find an available AID 
... and check that user-specified AID is available (before writing to the CAD)
 2022-01-08 00:36:59 +13:00
Matt Moran b3dc6f62ab Refactor, adds select_aid_and_auth_with_key 2022-01-07 23:59:46 +13:00
Matt Moran beefc97995 Add ability to use custom CAD key, add ability to skip some actions 
For cloning & deleting:
- Add ability to use custom Card Application Directory key (`--cadkey`)
- Add ability to skip updating the CAD (`--noupdatecad`)
- Add ability to skip creating/deleting the app and only update the CAD (`--nocreateapp`, `--nodeleteapp`)
 2022-01-07 23:57:47 +13:00
Matt Moran 69049a6621 Remove incorrect AID validation 2022-01-07 19:31:36 +13:00
iceman1001 81c6918ac5 cppcheck 2022-01-06 23:25:25 +01:00
iceman1001 d2c290c7c3 cppcheck fixes for const 2022-01-06 23:20:55 +01:00
iceman1001 6bb301f4da cppcheck fixes for const 2022-01-06 23:07:47 +01:00
iceman1001 7efd02b6e0 cppcheck fixes 2022-01-06 22:08:28 +01:00
iceman1001 72f2682544 cppcheck 2022-01-06 21:11:51 +01:00
iceman1001 6dbde61c4e cppcheck fixes 2022-01-06 21:08:22 +01:00
iceman1001 05576ba06b cppcheck fixes 2022-01-06 21:00:16 +01:00
iceman1001 edb5f18b3a Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-01-06 20:49:46 +01:00
iceman1001 0b4d584dd7 cppcheck fixes 2022-01-06 20:49:35 +01:00
Philippe Teuwen 2562811433 Revert "get android cmake running on host, only for testing" 
This reverts commit 3edf9a0975.
 2022-01-06 20:26:20 +01:00
Philippe Teuwen ac681a5836 fix Android CMake 2022-01-06 20:24:18 +01:00
Philippe Teuwen 3edf9a0975 get android cmake running on host, only for testing 2022-01-06 20:18:08 +01:00
iceman1001 60491c4f16 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-01-06 20:07:11 +01:00
iceman1001 04fe021a5f missing files 2022-01-06 20:07:03 +01:00
Philippe Teuwen ebba11b3f5 make style 2022-01-06 20:05:26 +01:00
Iceman 75c2462777
Merge pull request #1551 from DarkMatterMatt/feat/hf-gallagher 
Add `hf gallagher` commands
 2022-01-06 19:58:12 +01:00
iceman1001 b3731c6003 cppcheck fixes 2022-01-06 18:18:48 +01:00
Matt Moran 14b6580fcb Squashed commit of the following: 
commit 8f77179a2f
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Thu Jan 6 11:25:38 2022 +0100

    remove unused file

commit bcafc5d03c
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Thu Jan 6 11:24:04 2022 +0100

    some historical copyright adjustments, thanks @iceman1001!

commit b703bb746b
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Thu Jan 6 02:19:46 2022 +0100

    Adapting license headers, WIP

commit 8952a1f712
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Thu Jan 6 00:37:34 2022 +0100

    adapt contributing text

commit cdfb83075f
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Thu Jan 6 00:24:15 2022 +0100

    toc

commit 014817f854
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Thu Jan 6 00:15:40 2022 +0100

    Adding AUTHORS and changing licensing terms from 'GPLv2 or later' to 'GPLv3 or later' to comply with components available only under 'GPLv3 or later'. Details:

    Initial releases by Jonathan Westhues in 2005-2007 were made under GPL
    "either version 2 of the License, or (at your option) any later version"

    Since then, a number of dependencies and files were integrated to the project, but under a "GPLv3 or later" license. These components are reveng, desfire_crypto and lrpcrypto. Note that compnents cryptorf, hitag2crack and fpga-xc3s100e are also under GPLv3+ but not bound to the firmware or client source code.

    Therefore, we must mechanically upgrade the license of the whole project to GPLv3+, as made possible by the initial licensing terms and as mandated by the inclusion of GPLv3+ code.

    Still to do: update each source file header:

        Copyright (C) Proxmark3 contributors. See AUTHORS.md for details.

        This program is free software: you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
        the Free Software Foundation, either version 3 of the License, or
        (at your option) any later version.

        This program is distributed in the hope that it will be useful,
        but WITHOUT ANY WARRANTY; without even the implied warranty of
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
        GNU General Public License for more details.

        You should have received a copy of the GNU General Public License
        along with this program.  If not, see <http://www.gnu.org/licenses/>.

commit 5561466fe8
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Wed Jan 5 18:56:56 2022 +0100

    make style

commit 2d1a1dc034
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Wed Jan 5 17:57:49 2022 +0100

    make style doc/commands.json

commit fc53665e5c
Merge: a6d22ee43 c0cc09d86
Author: Philippe Teuwen <phil@teuwen.org>
Date:   Wed Jan 5 17:52:44 2022 +0100

    Merge pull request #1552 from joswr1ght/master

    Add --no-auth support for hf mfdes createapp

commit c0cc09d86b
Author: Joshua Wright <jwright@hasborg.com>
Date:   Wed Jan 5 07:12:20 2022 -0500

    Style consistency changes for hf mfdes createapp feature addition

commit f9c96f49da
Author: Joshua Wright <jwright@hasborg.com>
Date:   Tue Jan 4 17:01:10 2022 -0500

    Update CHANGELOG with MIFARE DESFire createapp --no-auth change

commit 859b55933d
Author: Joshua Wright <jwright@hasborg.com>
Date:   Tue Jan 4 15:55:26 2022 -0500

    Add --no-auth support for hf mfdes createapp
 2022-01-07 01:08:55 +13:00
Matt Moran 533b31bc6d Format code/strings 2022-01-07 01:03:43 +13:00
Matt Moran 6f510db9fb Fix incorrect CAD was written when removing credentials 2022-01-07 00:30:25 +13:00
Matt Moran 84ff84ffd0 Add hf gallagher diversify 2022-01-07 00:05:38 +13:00
Philippe Teuwen 5561466fe8 make style 2022-01-05 18:56:56 +01:00
Joshua Wright c0cc09d86b Style consistency changes for hf mfdes createapp feature addition 2022-01-05 07:12:20 -05:00
Matt Moran 82cd44e99f Reorder function definitions 
Order is roughly:
- exported helpers
- helpers
- read -> create -> delete
- exported commands
 2022-01-06 00:11:30 +13:00
Matt Moran 02e5fb6b1c Fix incorrect comments 2022-01-06 00:00:04 +13:00
Matt Moran de30ba90d1 Merge remote-tracking branch 'upstream/master' into feat/hf-gallagher 2022-01-05 23:56:33 +13:00
Matt Moran caebfdca62 Update license from LGPL to GPL 2022-01-05 23:54:18 +13:00
Matt Moran 8ecfc4af34 Make variables & function names snake_case 2022-01-05 23:53:03 +13:00
Matt Moran fad30294aa Format styles 2022-01-05 23:08:10 +13:00
Joshua Wright 859b55933d Add --no-auth support for hf mfdes createapp 2022-01-04 15:55:26 -05:00
Matt Moran 81da8a1317 Add hf gallagher delete command 2022-01-05 00:22:34 +13:00
Matt Moran 28437f018b Check if facility already exists in CAD 
Disallow duplicate credentials for the same facility (because readers won't handle it properly - I assume they'll just use the first entry?)
 2022-01-04 22:38:30 +13:00
Matt Moran d7989caad0 Automatically choose an new valid Gallagher AID 2022-01-04 22:15:00 +13:00
Matt Moran d3da798517 Move GallagherDiversifyKey to top of file 2022-01-04 21:14:18 +13:00
iceman1001 5ddfedbad0 cppcheck fix const 2022-01-04 07:32:58 +01:00
iceman1001 a7f3a42aff cppcheck fix const 2022-01-04 07:32:21 +01:00
iceman1001 ed10409bfd cppcheck fix uninitvar 2022-01-04 07:31:10 +01:00
iceman1001 cd825bfac8 cppcheck fixes 2022-01-04 07:28:20 +01:00
Matt Moran 28844756d9 Add default MIFARE Site Key 2022-01-04 18:19:42 +13:00
Matt Moran e129bee161 Fix print level should be ERR, was FAILED 2022-01-04 18:06:20 +13:00
Matt Moran f395b28643 Extract cadAidUintToByte and cadAidByteToUint 2022-01-04 18:06:02 +13:00
Matt Moran 21b080e49a Extract selectAid and authenticate commands 2022-01-04 17:42:05 +13:00
Matt Moran 1e3ed42f54 Extract CAD_AID to a constant 2022-01-04 17:04:05 +13:00
Matt Moran 863cf16015 Add comments and logging 2022-01-04 16:59:59 +13:00
Philippe Teuwen 0f9315391a Changed drastically Hitag S ARM code to remove state machines and ease way to build new commands, Fixed Hitag S crypto mode with key or NrAr, fixed lf hitag cc, fixed pwd dump in hitagS dump with LKP 2022-01-03 22:43:58 +01:00
iceman1001 3491157345 cppcheck fixes and other minor stuff 2022-01-03 22:17:40 +01:00
iceman1001 7b61c35948 textual change to trace list -h 2022-01-03 22:12:30 +01:00
iceman1001 0a4c9f83ac fixes to hf iclass configcard mem setup, textual output, MIX->NG convertion 2022-01-03 22:08:55 +01:00
Matt Moran aed687cb96 Add basic cloning support 2022-01-03 17:02:56 +13:00
Matt Moran 7b0a85a0af Fix incorrect types in encodeCardholderCredentials 2022-01-03 16:39:18 +13:00
Philippe Teuwen 89554501bb trace list: check protocol exists and allows to run without arg 2022-01-02 00:13:20 +01:00
iceman1001 0bad12fcac cppcheck 2022-01-01 17:45:43 +01:00