switch to license compatible with all dependencies

This commit is contained in:
shimun 2020-07-26 20:27:38 +02:00
parent 0e90169aad
commit 25d7c37d6d
Signed by: shimun
GPG Key ID: E81D8382DC2F971B
4 changed files with 378 additions and 689 deletions

View File

@ -11,7 +11,7 @@ repository = "https://github.com/shimunn/fido2luks"
readme = "README.md" readme = "README.md"
keywords = ["luks", "fido2", "u2f"] keywords = ["luks", "fido2", "u2f"]
categories = ["command-line-utilities"] categories = ["command-line-utilities"]
license-file = "LICENSE" license = "MPL 2.0"
[dependencies] [dependencies]
ctap_hmac = { version="0.4.2", features = ["request_multiple"] } ctap_hmac = { version="0.4.2", features = ["request_multiple"] }

1047
LICENSE

File diff suppressed because it is too large Load Diff

View File

@ -99,16 +99,11 @@ sudo rm -rf /usr/lib/dracut/modules.d/96luks-2fa /etc/dracut.conf.d/luks-2fa.con
## License ## License
Licensed under either of Licensed under the Mozilla Public License 2.0, ([LICENSE-MPL](LICENSE) or https://www.mozilla.org/en-US/MPL/2.0/)
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or https://www.apache.org/licenses/LICENSE-2.0)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or https://opensource.org/licenses/MIT)
at your option.
### Contribution ### Contribution
Unless you explicitly state otherwise, any contribution intentionally Unless you explicitly state otherwise, any contribution intentionally
submitted for inclusion in the work by you, as defined in the Apache-2.0 submitted for inclusion in the work by you, as defined in the MPL 2.0
license, shall be dual licensed as above, without any additional terms or license, shall be dual licensed as above, without any additional terms or
conditions. conditions.

View File

@ -5,16 +5,11 @@
## License ## License
Licensed under either of Licensed under the Mozilla Public License 2.0, ([LICENSE-MPL](LICENSE) or https://www.mozilla.org/en-US/MPL/2.0/)
* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or https://www.apache.org/licenses/LICENSE-2.0)
* MIT license ([LICENSE-MIT](LICENSE-MIT) or https://opensource.org/licenses/MIT)
at your option.
### Contribution ### Contribution
Unless you explicitly state otherwise, any contribution intentionally Unless you explicitly state otherwise, any contribution intentionally
submitted for inclusion in the work by you, as defined in the Apache-2.0 submitted for inclusion in the work by you, as defined in the MPL 2.0
license, shall be dual licensed as above, without any additional terms or license, shall be dual licensed as above, without any additional terms or
conditions. conditions.