From a88373722e75db7ed6d41b17c37bb662909b34b8 Mon Sep 17 00:00:00 2001 From: Kevin Lewi Date: Mon, 22 May 2023 23:04:26 -0700 Subject: [PATCH] Updating dual-license language (#324) --- .cargo/license.rs | 9 +++++---- CONTRIBUTING.md | 3 ++- LICENSE | 12 ------------ README.md | 4 +++- benches/opaque.rs | 9 +++++---- examples/digital_locker.rs | 9 +++++---- examples/simple_login.rs | 9 +++++---- scripts/digital_locker.exp | 9 ++++++--- scripts/simple_login.exp | 9 ++++++--- src/ciphersuite.rs | 9 +++++---- src/envelope.rs | 9 +++++---- src/errors.rs | 9 +++++---- src/hash.rs | 9 +++++---- src/key_exchange/group/curve25519.rs | 9 +++++---- src/key_exchange/group/elliptic_curve.rs | 9 +++++---- src/key_exchange/group/mod.rs | 9 +++++---- src/key_exchange/group/ristretto255.rs | 9 +++++---- src/key_exchange/mod.rs | 9 +++++---- src/key_exchange/traits.rs | 9 +++++---- src/key_exchange/tripledh.rs | 9 +++++---- src/keypair.rs | 9 +++++---- src/ksf.rs | 9 +++++---- src/lib.rs | 9 +++++---- src/messages.rs | 9 +++++---- src/opaque.rs | 9 +++++---- src/serialization/mod.rs | 9 +++++---- src/serialization/tests.rs | 9 +++++---- src/tests/full_test.rs | 9 +++++---- src/tests/mock_rng.rs | 9 +++++---- src/tests/mod.rs | 9 +++++---- src/tests/opaque_vectors.rs | 9 +++++---- src/tests/parser.rs | 9 +++++---- src/tests/test_opaque_vectors.rs | 9 +++++---- src/util.rs | 9 +++++---- 34 files changed, 162 insertions(+), 136 deletions(-) delete mode 100644 LICENSE diff --git a/.cargo/license.rs b/.cargo/license.rs index 3fa8d9f..664968b 100644 --- a/.cargo/license.rs +++ b/.cargo/license.rs @@ -1,6 +1,7 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f4043ae..145a05a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,4 +27,5 @@ outlined on that page and do not file a public issue. ## License By contributing to opaque-ke, you agree that your contributions will be -licensed under the LICENSE file in the root directory of this source tree. +licensed under both the LICENSE-MIT and LICENSE-APACHE files in the root +directory of this source tree. diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 09250ca..0000000 --- a/LICENSE +++ /dev/null @@ -1,12 +0,0 @@ -## License - -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. - -### Contribution - -Unless you explicitly state otherwise, any contribution intentionally submitted -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. diff --git a/README.md b/README.md index 89d6999..3a711f5 100644 --- a/README.md +++ b/README.md @@ -60,4 +60,6 @@ improvements to the library. License ------- -This project is [licensed](./LICENSE) under either Apache 2.0 or MIT, at your option. +This project is dual-licensed under either the [MIT license](./LICENSE-MIT) +or the [Apache License, Version 2.0](./LICENSE-APACHE). +You may select, at your option, one of the above-listed licenses. diff --git a/benches/opaque.rs b/benches/opaque.rs index 4cb76ef..683d21c 100644 --- a/benches/opaque.rs +++ b/benches/opaque.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. #[macro_use] extern crate criterion; diff --git a/examples/digital_locker.rs b/examples/digital_locker.rs index c1a8d92..d595df3 100644 --- a/examples/digital_locker.rs +++ b/examples/digital_locker.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! Demonstrates an implementation of a server-side secured digital locker using //! the client's OPAQUE export key, over a command-line interface diff --git a/examples/simple_login.rs b/examples/simple_login.rs index 7e82c52..d6ed467 100644 --- a/examples/simple_login.rs +++ b/examples/simple_login.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! Demonstrates a simple client-server password-based login protocol using //! OPAQUE, over a command-line interface diff --git a/scripts/digital_locker.exp b/scripts/digital_locker.exp index c36c8ac..8e3cbb3 100644 --- a/scripts/digital_locker.exp +++ b/scripts/digital_locker.exp @@ -1,8 +1,11 @@ #!/bin/expect -f -# Copyright (c) Facebook, Inc. and its affiliates. + +# Copyright (c) Meta Platforms, Inc. and affiliates. # -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. +# This source code is dual-licensed under either the MIT license found in the +# LICENSE-MIT file in the root directory of this source tree or the Apache +# License, Version 2.0 found in the LICENSE-APACHE file in the root directory +# of this source tree. You may select, at your option, one of the above-listed licenses. set timeout 1 spawn cargo run --example digital_locker diff --git a/scripts/simple_login.exp b/scripts/simple_login.exp index c112a62..075d1e0 100644 --- a/scripts/simple_login.exp +++ b/scripts/simple_login.exp @@ -1,8 +1,11 @@ #!/bin/expect -f -# Copyright (c) Facebook, Inc. and its affiliates. + +# Copyright (c) Meta Platforms, Inc. and affiliates. # -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. +# This source code is dual-licensed under either the MIT license found in the +# LICENSE-MIT file in the root directory of this source tree or the Apache +# License, Version 2.0 found in the LICENSE-APACHE file in the root directory +# of this source tree. You may select, at your option, one of the above-listed licenses. set timeout 1 spawn cargo run --example simple_login diff --git a/src/ciphersuite.rs b/src/ciphersuite.rs index c614379..b686cb1 100644 --- a/src/ciphersuite.rs +++ b/src/ciphersuite.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! Defines the CipherSuite trait to specify the underlying primitives for //! OPAQUE diff --git a/src/envelope.rs b/src/envelope.rs index cc373e2..e7e3c9f 100644 --- a/src/envelope.rs +++ b/src/envelope.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. use core::convert::TryFrom; use core::ops::Add; diff --git a/src/errors.rs b/src/errors.rs index 1780c0e..6ef40de 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! A list of error types which are produced during an execution of the protocol use core::convert::Infallible; diff --git a/src/hash.rs b/src/hash.rs index 20fdfc9..d7b7210 100644 --- a/src/hash.rs +++ b/src/hash.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! A convenience trait for digest bounds used throughout the library diff --git a/src/key_exchange/group/curve25519.rs b/src/key_exchange/group/curve25519.rs index 0be25e8..210c8be 100644 --- a/src/key_exchange/group/curve25519.rs +++ b/src/key_exchange/group/curve25519.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! Key Exchange group implementation for Curve25519 diff --git a/src/key_exchange/group/elliptic_curve.rs b/src/key_exchange/group/elliptic_curve.rs index f2a1b5e..782f53b 100644 --- a/src/key_exchange/group/elliptic_curve.rs +++ b/src/key_exchange/group/elliptic_curve.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. use digest::core_api::BlockSizeUser; use digest::{FixedOutput, HashMarker}; diff --git a/src/key_exchange/group/mod.rs b/src/key_exchange/group/mod.rs index fe58c6e..47acc81 100644 --- a/src/key_exchange/group/mod.rs +++ b/src/key_exchange/group/mod.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! Includes the KeGroup trait and definitions for the key exchange groups diff --git a/src/key_exchange/group/ristretto255.rs b/src/key_exchange/group/ristretto255.rs index abacca8..b5d9194 100644 --- a/src/key_exchange/group/ristretto255.rs +++ b/src/key_exchange/group/ristretto255.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! Key Exchange group implementation for ristretto255 diff --git a/src/key_exchange/mod.rs b/src/key_exchange/mod.rs index a4cfd51..afbdb11 100644 --- a/src/key_exchange/mod.rs +++ b/src/key_exchange/mod.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! Includes instantiations of key exchange protocols used in the login step for //! OPAQUE diff --git a/src/key_exchange/traits.rs b/src/key_exchange/traits.rs index 2cf9526..c31d0e9 100644 --- a/src/key_exchange/traits.rs +++ b/src/key_exchange/traits.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. use digest::core_api::BlockSizeUser; use digest::Output; diff --git a/src/key_exchange/tripledh.rs b/src/key_exchange/tripledh.rs index 1335d35..e09d2b0 100644 --- a/src/key_exchange/tripledh.rs +++ b/src/key_exchange/tripledh.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! An implementation of the Triple Diffie-Hellman key exchange protocol use core::convert::TryFrom; diff --git a/src/keypair.rs b/src/keypair.rs index 9b06e8c..a89a9d8 100644 --- a/src/keypair.rs +++ b/src/keypair.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! Contains the keypair types that must be supplied for the OPAQUE API diff --git a/src/ksf.rs b/src/ksf.rs index 677c75c..b14e430 100644 --- a/src/ksf.rs +++ b/src/ksf.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! Trait specifying a key stretching function diff --git a/src/lib.rs b/src/lib.rs index 8a911cb..1600364 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! An implementation of the OPAQUE asymmetric password authentication key //! exchange protocol diff --git a/src/messages.rs b/src/messages.rs index daca5be..ab9eb47 100644 --- a/src/messages.rs +++ b/src/messages.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! Contains the messages used for OPAQUE diff --git a/src/opaque.rs b/src/opaque.rs index b9d2154..2387609 100644 --- a/src/opaque.rs +++ b/src/opaque.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! Provides the main OPAQUE API diff --git a/src/serialization/mod.rs b/src/serialization/mod.rs index a530508..9685310 100644 --- a/src/serialization/mod.rs +++ b/src/serialization/mod.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. use core::marker::PhantomData; diff --git a/src/serialization/tests.rs b/src/serialization/tests.rs index 5836480..76cd427 100644 --- a/src/serialization/tests.rs +++ b/src/serialization/tests.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. use core::ops::Add; use std::vec; diff --git a/src/tests/full_test.rs b/src/tests/full_test.rs index cdf6937..977d27a 100644 --- a/src/tests/full_test.rs +++ b/src/tests/full_test.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. #![allow(unsafe_code)] diff --git a/src/tests/mock_rng.rs b/src/tests/mock_rng.rs index 82ed310..e3d2394 100644 --- a/src/tests/mock_rng.rs +++ b/src/tests/mock_rng.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. use core::cmp::min; use std::vec::Vec; diff --git a/src/tests/mod.rs b/src/tests/mod.rs index 94863d5..0a87984 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. mod full_test; pub mod mock_rng; diff --git a/src/tests/opaque_vectors.rs b/src/tests/opaque_vectors.rs index 5ba1f3d..3a0668d 100644 --- a/src/tests/opaque_vectors.rs +++ b/src/tests/opaque_vectors.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! The OPAQUE test vectors taken from https://github.com/cfrg/draft-irtf-cfrg-opaque/blob/master/draft-irtf-cfrg-opaque.md, //! which are presented in https://www.ietf.org/archive/id/draft-irtf-cfrg-opaque-08.txt diff --git a/src/tests/parser.rs b/src/tests/parser.rs index c53024e..09ced9d 100644 --- a/src/tests/parser.rs +++ b/src/tests/parser.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. use std::string::{String, ToString}; use std::vec::Vec; diff --git a/src/tests/test_opaque_vectors.rs b/src/tests/test_opaque_vectors.rs index 88ad70e..2fc2fc0 100644 --- a/src/tests/test_opaque_vectors.rs +++ b/src/tests/test_opaque_vectors.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. use core::ops::Add; use std::vec; diff --git a/src/util.rs b/src/util.rs index 2aaff7d..283713c 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,9 +1,10 @@ -// Copyright (c) Facebook, Inc. and its affiliates. +// Copyright (c) Meta Platforms, Inc. and affiliates. // -// This source code is licensed under both the MIT license found in the -// LICENSE-MIT file in the root directory of this source tree and the Apache +// This source code is dual-licensed under either the MIT license found in the +// LICENSE-MIT file in the root directory of this source tree or the Apache // License, Version 2.0 found in the LICENSE-APACHE file in the root directory -// of this source tree. +// of this source tree. You may select, at your option, one of the above-listed +// licenses. //! Utility functions.