Skip to content

Commit

Permalink
Relicensing. This will not be applied to older versions.
Browse files Browse the repository at this point in the history
- GPLv3
+ MPL-2.0
  • Loading branch information
paragonie-security committed Oct 19, 2017
1 parent bd3c115 commit 35d752b
Show file tree
Hide file tree
Showing 48 changed files with 620 additions and 680 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Version 4.0.1 (2017-10-19)

* Prompted by [#67](https://github.com/paragonie/halite/issues/67), Halite is now available
under the terms of the Mozilla Public License 2.0 (MPL-2.0). Using Halite to build products
that restrict user freedom (such as DRM) is highly discouraged, but not forbidden.

## Version 4.0.0 (2017-09-16)

* Bump minimum PHP version to **7.2.0**, which will be available before the end of 2017
Expand Down
1,046 changes: 372 additions & 674 deletions LICENSE

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,18 @@ Halite was created by [Paragon Initiative Enterprises](https://paragonie.com) as
a result of our continued efforts to improve the ecosystem and make [cryptography in PHP](https://paragonie.com/blog/2015/09/state-cryptography-in-php)
safer and easier to implement.

It's released under the GPLv3 license. [Commercial licenses are available](https://paragonie.com/contact) from
Paragon Initiative Enterprises if you wish to implement Halite in an application
without making your source code available under a GPL-compatible license.
Halite is released under Mozilla Public License 2.0. [Commercial licenses are available](https://paragonie.com/contact)
from Paragon Initiative Enterprises if you wish to extend Halite without making your
derivative works available under the terms of the MPL.

If you are satisfied with the terms of GPLv3 software for backend web applications
If you are satisfied with the terms of MPL software for backend web applications
but would like to purchase a support contract for your application that uses Halite,
those are also offered by Paragon Initiative Enterprises.

**Important:** Earlier versions of Halite were available under the GNU Public License
version 3 (GPLv3). Only Halite 4.0.1 and newer are available under the Mozille Public
License terms.

## Installing Halite

Before you can use Halite, you must choose a version that fits the requirements
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"phpunit/phpunit": "^6",
"vimeo/psalm": "^0|^1"
},
"license": "GPL3",
"license": "MPL-2.0",
"authors": [
{
"name": "Paragon Initiative Enterprises",
Expand Down
8 changes: 8 additions & 0 deletions src/Alerts/CannotCloneKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class CannotCloneKey
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class CannotCloneKey extends HaliteAlert
{

Expand Down
8 changes: 8 additions & 0 deletions src/Alerts/CannotPerformOperation.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class CannotPerformOperation
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class CannotPerformOperation extends HaliteAlert
{

Expand Down
8 changes: 8 additions & 0 deletions src/Alerts/CannotSerializeKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class CannotSerializeKey
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class CannotSerializeKey extends HaliteAlert
{

Expand Down
8 changes: 8 additions & 0 deletions src/Alerts/ConfigDirectiveNotFound.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class ConfigDirectiveNotFound
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class ConfigDirectiveNotFound extends HaliteAlert
{

Expand Down
8 changes: 8 additions & 0 deletions src/Alerts/FileAccessDenied.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class FileAccessDenied
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class FileAccessDenied extends HaliteAlert
{

Expand Down
10 changes: 9 additions & 1 deletion src/Alerts/FileModified.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class FileModified
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class FileModified extends HaliteAlert
{

}
}
8 changes: 8 additions & 0 deletions src/Alerts/HaliteAlert.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class HaliteAlert
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class HaliteAlert extends \Exception
{

Expand Down
8 changes: 8 additions & 0 deletions src/Alerts/InvalidDigestLength.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class InvalidDigestLength
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class InvalidDigestLength extends HaliteAlert
{

Expand Down
8 changes: 8 additions & 0 deletions src/Alerts/InvalidFlags.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class InvalidFlags
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class InvalidFlags extends HaliteAlert
{

Expand Down
8 changes: 8 additions & 0 deletions src/Alerts/InvalidKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class InvalidKey
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class InvalidKey extends HaliteAlert
{

Expand Down
8 changes: 8 additions & 0 deletions src/Alerts/InvalidMessage.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class InvalidMessage
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class InvalidMessage extends HaliteAlert
{

Expand Down
8 changes: 8 additions & 0 deletions src/Alerts/InvalidSalt.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class InvalidSalt
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class InvalidSalt extends HaliteAlert
{

Expand Down
8 changes: 8 additions & 0 deletions src/Alerts/InvalidSignature.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class InvalidSignature
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class InvalidSignature extends HaliteAlert
{

Expand Down
8 changes: 8 additions & 0 deletions src/Alerts/InvalidType.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
declare(strict_types=1);
namespace ParagonIE\Halite\Alerts;

/**
* Class InvalidType
* @package ParagonIE\Halite\Alerts
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class InvalidType extends HaliteAlert
{

Expand Down
4 changes: 4 additions & 0 deletions src/Asymmetric/Crypto.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
* @ref http://php.net/manual/en/functions.returning-values.php#functions.returning-values.type-declaration
*
* @package ParagonIE\Halite\Asymmetric
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
final class Crypto
{
Expand Down
4 changes: 4 additions & 0 deletions src/Asymmetric/EncryptionPublicKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
/**
* Class EncryptionPublicKey
* @package ParagonIE\Halite\Asymmetric
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
final class EncryptionPublicKey extends PublicKey
{
Expand Down
4 changes: 4 additions & 0 deletions src/Asymmetric/EncryptionSecretKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
/**
* Class EncryptionSecretKey
* @package ParagonIE\Halite\Asymmetric
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
final class EncryptionSecretKey extends SecretKey
{
Expand Down
4 changes: 4 additions & 0 deletions src/Asymmetric/PublicKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
/**
* Class PublicKey
* @package ParagonIE\Halite\Asymmetric
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class PublicKey extends Key
{
Expand Down
4 changes: 4 additions & 0 deletions src/Asymmetric/SecretKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
/**
* Class SecretKey
* @package ParagonIE\Halite\Asymmetric
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class SecretKey extends Key
{
Expand Down
4 changes: 4 additions & 0 deletions src/Asymmetric/SignaturePublicKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
/**
* Class SignaturePublicKey
* @package ParagonIE\Halite\Asymmetric
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
final class SignaturePublicKey extends PublicKey
{
Expand Down
4 changes: 4 additions & 0 deletions src/Asymmetric/SignatureSecretKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
/**
* Class SignatureSecretKey
* @package ParagonIE\Halite\Asymmetric
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
final class SignatureSecretKey extends SecretKey
{
Expand Down
4 changes: 4 additions & 0 deletions src/Config.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
* @ref http://php.net/manual/en/functions.returning-values.php#functions.returning-values.type-declaration
*
* @package ParagonIE\Halite
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
class Config
{
Expand Down
4 changes: 4 additions & 0 deletions src/Contract/StreamInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
* @ref http://php.net/manual/en/functions.returning-values.php#functions.returning-values.type-declaration
*
* @package ParagonIE\Halite\Contract
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
interface StreamInterface
{
Expand Down
4 changes: 4 additions & 0 deletions src/Cookie.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@
* @ref http://php.net/manual/en/functions.returning-values.php#functions.returning-values.type-declaration
*
* @package ParagonIE\Halite
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
final class Cookie
{
Expand Down
4 changes: 4 additions & 0 deletions src/EncryptionKeyPair.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
* @ref http://php.net/manual/en/functions.returning-values.php#functions.returning-values.type-declaration
*
* @package ParagonIE\Halite
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
final class EncryptionKeyPair extends KeyPair
{
Expand Down
4 changes: 4 additions & 0 deletions src/File.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
* @ref http://php.net/manual/en/functions.returning-values.php#functions.returning-values.type-declaration
*
* @package ParagonIE\Halite
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
final class File
{
Expand Down
4 changes: 4 additions & 0 deletions src/Halite.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
* @ref http://php.net/manual/en/functions.returning-values.php#functions.returning-values.type-declaration
*
* @package ParagonIE\Halite
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
final class Halite
{
Expand Down
Loading

0 comments on commit 35d752b

Please sign in to comment.