Commit graph

14802 commits

Author SHA1 Message Date
Philippe Teuwen e618fbcd28 typo 2022-01-06 20:14:58 +01:00
Philippe Teuwen 3d61cf1eed release checklist 2022-01-06 20:08:17 +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
Philippe Teuwen a315254a88 style 2022-01-06 19:46:35 +01:00
iceman1001 b98d518fd7 style 2022-01-06 19:41:45 +01:00
iceman1001 b3731c6003 cppcheck fixes 2022-01-06 18:18:48 +01:00
iceman1001 e550f8ccc8 cppcheck fixes for const 2022-01-06 15:40:11 +01:00
iceman1001 0bb9c43354 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2022-01-06 15:24:35 +01:00
iceman1001 b55a33b1d7 cppcheck fixes for const 2022-01-06 15:22:36 +01:00
Philippe Teuwen 9718af480a Avoid com port in commands.json 2022-01-06 15:18:56 +01:00
Matt Moran f67485d2dd Merge remote-tracking branch 'upstream/master' into feat/hf-gallagher 2022-01-07 01:30:23 +13: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 8f77179a2f remove unused file 2022-01-06 11:25:38 +01:00
Philippe Teuwen bcafc5d03c some historical copyright adjustments, thanks @iceman1001! 2022-01-06 11:24:04 +01:00
Philippe Teuwen b703bb746b Adapting license headers, WIP 2022-01-06 02:20:38 +01:00
Philippe Teuwen 8952a1f712 adapt contributing text 2022-01-06 00:37:34 +01:00
Philippe Teuwen cdfb83075f toc 2022-01-06 00:24:15 +01:00
Philippe Teuwen 014817f854 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/>.
2022-01-06 00:22:44 +01:00
Philippe Teuwen 5561466fe8 make style 2022-01-05 18:56:56 +01:00
Philippe Teuwen 2d1a1dc034 make style doc/commands.json 2022-01-05 17:57:49 +01:00
Philippe Teuwen fc53665e5c
Merge pull request #1552 from joswr1ght/master
Add --no-auth support for hf mfdes createapp
2022-01-05 17:52:44 +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
Philippe Teuwen a6d22ee435
Merge pull request #1553 from zkldi/patch-1
Use pacman -Syu instead of pacman -Sy
2022-01-05 11:35:41 +01:00
Matt Moran fad30294aa Format styles 2022-01-05 23:08:10 +13:00
zkldi 025d28a9dc
Use pacman -Syu instead of pacman -Sy
`pacman -Sy` can result in partial upgrades and system damage if the user doesn't understand what it entails and never finishes the upgrade.

See: https://bbs.archlinux.org/viewtopic.php?id=241092
2022-01-05 00:39:24 +00:00
Joshua Wright f9c96f49da Update CHANGELOG with MIFARE DESFire createapp --no-auth change 2022-01-04 17:01:10 -05: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 224e2f68b2 cppcheck fix 2022-01-04 07:36:31 +01: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