Updating to dual-license (#252)

Cargo.toml

@@ -6,7 +6,7 @@ keywords = ["cryptography", "crypto", "opaque", "passwords", "authentication"]
 categories = ["no-std"]
 description = "An implementation of the OPAQUE password-authenticated key exchange protocol"
 authors = ["Kevin Lewi <[email protected]>", "François Garillot <[email protected]>"]
-license = "MIT"
+license = "Apache-2.0 OR MIT"
 edition = "2018"
 readme = "README.md"
 resolver = "2"

LICENSE

@@ -1,21 +1,12 @@
-MIT License
+## License
 
-Copyright (c) Facebook, Inc. and its affiliates.
+Licensed under either of
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+at your option.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+### Contribution
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+Unless you explicitly state otherwise, any contribution intentionally submitted
-copies or substantial portions of the Software.
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall
-
+be dual licensed as above, without any additional terms or conditions.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -50,8 +50,7 @@ Special thanks go to Hugo Krawczyk and Chris Wood for helping to clarify discrep
 this implementation. Additional credit goes to @daxpedda for adding no_std support, p256 support, and making other general
 improvements to the library.
 
-
 License
 -------
 
-This project is [MIT licensed](./LICENSE).
+This project is [licensed](./LICENSE) under either Apache 2.0 or MIT, at your option.

benches/opaque.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 #[macro_use]
 extern crate criterion;

examples/digital_locker.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! Demonstrates an implementation of a server-side secured digital locker using
 //! the client's OPAQUE export key, over a command-line interface

examples/simple_login.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! Demonstrates a simple client-server password-based login protocol
 //! using OPAQUE, over a command-line interface

src/ciphersuite.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! Defines the CipherSuite trait to specify the underlying primitives for OPAQUE
 

src/envelope.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 use crate::{
     ciphersuite::CipherSuite,

src/errors.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! A list of error types which are produced during an execution of the protocol
 use core::convert::Infallible;

src/hash.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! A convenience trait for digest bounds used throughout the library
 

src/impls.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 macro_rules! impl_debug_eq_hash_for {
     (struct $name:ident$(<$($gen:ident$(: $bound:tt)?),+$(,)?>)?, [$field1:ident$(, $field2:ident)*$(,)?]$(, )?$([$($type:ty),+$(,)?]$(,)?)?) => {

src/key_exchange/group/mod.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! Includes the KeGroup trait and definitions for the
 //! key exchange groups

src/key_exchange/group/p256.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! Key Exchange group implementation for p256
 

src/key_exchange/group/ristretto255.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! Key Exchange group implementation for ristretto255
 

src/key_exchange/group/x25519.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! Key Exchange group implementation for x25519
 

src/key_exchange/mod.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! Includes instantiations of key exchange protocols used in the
 //! login step for OPAQUE

src/key_exchange/traits.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 use crate::key_exchange::group::KeGroup;
 use crate::{

src/key_exchange/tripledh.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! An implementation of the Triple Diffie-Hellman key exchange protocol
 use crate::{

src/keypair.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! Contains the keypair types that must be supplied for the OPAQUE API
 

src/lib.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! An implementation of the OPAQUE asymmetric password authentication key exchange protocol
 //!

src/messages.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! Contains the messages used for OPAQUE
 

src/opaque.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! Provides the main OPAQUE API
 

src/serialization/mod.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 use crate::errors::ProtocolError;
 use alloc::vec::Vec;

src/serialization/tests.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 use crate::{
     ciphersuite::CipherSuite,

src/slow_hash.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! Trait specifying a slow hashing function
 

src/tests/full_test.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 #![allow(unsafe_code)]
 

src/tests/mock_rng.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 use alloc::vec::Vec;
 use core::cmp::min;

src/tests/mod.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 mod full_test;
 pub mod mock_rng;

src/tests/opaque_vectors.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 //! The OPAQUE test vectors taken from:
 //! https://github.com/cfrg/draft-irtf-cfrg-opaque/blob/master/draft-irtf-cfrg-opaque.md

src/tests/parser.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 use alloc::string::String;
 

src/tests/test_opaque_vectors.rs

@@ -1,7 +1,9 @@
 // Copyright (c) Facebook, Inc. and its affiliates.
 //
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under both the MIT license found in the
-// LICENSE file in the root directory of this source tree.
+// LICENSE-MIT file in the root directory of this source tree and the Apache
+// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
+// of this source tree.
 
 use crate::{
     ciphersuite::CipherSuite, errors::*, key_exchange::tripledh::TripleDH, opaque::*,