From f79ebf984462cce156a4c01d4515710b2cdf2305 Mon Sep 17 00:00:00 2001 From: Kevin Lewi Date: Mon, 22 May 2023 23:04:39 -0700 Subject: [PATCH] Updating dual-license language (#110) --- .cargo/license.rs | 9 +++++---- CONTRIBUTING.md | 3 ++- LICENSE | 12 ------------ README.md | 4 +++- src/ciphersuite.rs | 9 +++++---- src/common.rs | 9 +++++---- src/error.rs | 9 +++++---- src/group/elliptic_curve.rs | 9 +++++---- src/group/mod.rs | 9 +++++---- src/group/ristretto.rs | 9 +++++---- src/group/tests.rs | 9 +++++---- src/lib.rs | 9 +++++---- src/oprf.rs | 9 +++++---- src/poprf.rs | 9 +++++---- src/serialization.rs | 9 +++++---- src/tests/cfrg_vectors.rs | 9 +++++---- src/tests/mock_rng.rs | 9 +++++---- src/tests/mod.rs | 9 +++++---- src/tests/parser.rs | 9 +++++---- src/tests/test_cfrg_vectors.rs | 9 +++++---- src/voprf.rs | 9 +++++---- 21 files changed, 95 insertions(+), 86 deletions(-) delete mode 100644 LICENSE diff --git a/.cargo/license.rs b/.cargo/license.rs index 3fa8d9f..4b470fe 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 906df5e..a2aeae6 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 voprf, 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 37c699f..d217a1f 100644 --- a/README.md +++ b/README.md @@ -32,4 +32,6 @@ To learn more about contributing to this project, [see this document](./CONTRIBU 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/src/ciphersuite.rs b/src/ciphersuite.rs index 8e3ea7f..0f080d2 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 VOPRF diff --git a/src/common.rs b/src/common.rs index eb4d55f..eb9bb2d 100644 --- a/src/common.rs +++ b/src/common.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. //! Common functionality between multiple OPRF modes. diff --git a/src/error.rs b/src/error.rs index 2819edb..5e794bf 100644 --- a/src/error.rs +++ b/src/error.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. //! Errors which are produced during an execution of the protocol diff --git a/src/group/elliptic_curve.rs b/src/group/elliptic_curve.rs index 5cc7d2d..2ecafda 100644 --- a/src/group/elliptic_curve.rs +++ b/src/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/group/mod.rs b/src/group/mod.rs index 95f71f6..923ec9a 100644 --- a/src/group/mod.rs +++ b/src/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. //! Defines the Group trait to specify the underlying prime order group diff --git a/src/group/ristretto.rs b/src/group/ristretto.rs index 910a96c..568e1b7 100644 --- a/src/group/ristretto.rs +++ b/src/group/ristretto.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 curve25519_dalek::constants::RISTRETTO_BASEPOINT_POINT; use curve25519_dalek::ristretto::{CompressedRistretto, RistrettoPoint}; diff --git a/src/group/tests.rs b/src/group/tests.rs index 6cda7d7..a453593 100644 --- a/src/group/tests.rs +++ b/src/group/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. //! Includes a series of tests for the group implementations diff --git a/src/lib.rs b/src/lib.rs index 950a482..35c854a 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 a verifiable oblivious pseudorandom function (VOPRF) //! diff --git a/src/oprf.rs b/src/oprf.rs index f2b3df9..092b1c4 100644 --- a/src/oprf.rs +++ b/src/oprf.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 main OPRF API diff --git a/src/poprf.rs b/src/poprf.rs index 0a4632a..d1931ba 100644 --- a/src/poprf.rs +++ b/src/poprf.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 main POPRF API diff --git a/src/serialization.rs b/src/serialization.rs index 640f4f7..a2bb6c2 100644 --- a/src/serialization.rs +++ b/src/serialization.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. //! Handles the serialization of each of the components used in the VOPRF //! protocol diff --git a/src/tests/cfrg_vectors.rs b/src/tests/cfrg_vectors.rs index 893a2d6..d7b23b6 100644 --- a/src/tests/cfrg_vectors.rs +++ b/src/tests/cfrg_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 VOPRF test vectors taken from: //! https://github.com/cfrg/draft-irtf-cfrg-voprf/blob/draft-irtf-cfrg-voprf-19/draft-irtf-cfrg-voprf.md diff --git a/src/tests/mock_rng.rs b/src/tests/mock_rng.rs index c055ea9..eea5442 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 alloc::vec::Vec; use core::cmp::min; diff --git a/src/tests/mod.rs b/src/tests/mod.rs index 56a7fc7..71e7089 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 cfrg_vectors; mod mock_rng; diff --git a/src/tests/parser.rs b/src/tests/parser.rs index b9ee7df..d5411de 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 alloc::string::{String, ToString}; use alloc::vec::Vec; diff --git a/src/tests/test_cfrg_vectors.rs b/src/tests/test_cfrg_vectors.rs index 454cb10..aa31239 100644 --- a/src/tests/test_cfrg_vectors.rs +++ b/src/tests/test_cfrg_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 alloc::string::String; use alloc::vec; diff --git a/src/voprf.rs b/src/voprf.rs index 0fc5c99..f37b5e1 100644 --- a/src/voprf.rs +++ b/src/voprf.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 main VOPRF API