Skip to content

Commit f79ebf9

Browse files
kevinlewikevinlewi
authored
Updating dual-license language (#110)
1 parent 20a35da commit f79ebf9

21 files changed

+95
-86
lines changed

‎.cargo/license.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed\
7+
// licenses.

‎CONTRIBUTING.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ outlined on that page and do not file a public issue.
2727

2828
## License
2929
By contributing to voprf, you agree that your contributions will be
30-
licensed under the LICENSE file in the root directory of this source tree.
30+
licensed under both the LICENSE-MIT and LICENSE-APACHE files in the root
31+
directory of this source tree.

‎LICENSE

-12
This file was deleted.

‎README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,6 @@ To learn more about contributing to this project, [see this document](./CONTRIBU
3232
License
3333
-------
3434

35-
This project is [licensed](./LICENSE) under either Apache 2.0 or MIT, at your option.
35+
This project is dual-licensed under either the [MIT license](./LICENSE-MIT)
36+
or the [Apache License, Version 2.0](./LICENSE-APACHE).
37+
You may select, at your option, one of the above-listed licenses.

‎src/ciphersuite.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
//! Defines the CipherSuite trait to specify the underlying primitives for VOPRF
910

‎src/common.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
//! Common functionality between multiple OPRF modes.
910

‎src/error.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
//! Errors which are produced during an execution of the protocol
910

‎src/group/elliptic_curve.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
use digest::core_api::BlockSizeUser;
910
use digest::{FixedOutput, HashMarker};

‎src/group/mod.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
//! Defines the Group trait to specify the underlying prime order group
910

‎src/group/ristretto.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
use curve25519_dalek::constants::RISTRETTO_BASEPOINT_POINT;
910
use curve25519_dalek::ristretto::{CompressedRistretto, RistrettoPoint};

‎src/group/tests.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
//! Includes a series of tests for the group implementations
910

‎src/lib.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
//! An implementation of a verifiable oblivious pseudorandom function (VOPRF)
910
//!

‎src/oprf.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
//! Contains the main OPRF API
910

‎src/poprf.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
//! Contains the main POPRF API
910

‎src/serialization.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
//! Handles the serialization of each of the components used in the VOPRF
910
//! protocol

‎src/tests/cfrg_vectors.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
//! The VOPRF test vectors taken from:
910
//! https://github.com/cfrg/draft-irtf-cfrg-voprf/blob/draft-irtf-cfrg-voprf-19/draft-irtf-cfrg-voprf.md

‎src/tests/mock_rng.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
use alloc::vec::Vec;
910
use core::cmp::min;

‎src/tests/mod.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
mod cfrg_vectors;
910
mod mock_rng;

‎src/tests/parser.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
use alloc::string::{String, ToString};
910
use alloc::vec::Vec;

‎src/tests/test_cfrg_vectors.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
use alloc::string::String;
910
use alloc::vec;

‎src/voprf.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
// Copyright (c) Facebook, Inc. and its affiliates.
1+
// Copyright (c) Meta Platforms, Inc. and affiliates.
22
//
3-
// This source code is licensed under both the MIT license found in the
4-
// LICENSE-MIT file in the root directory of this source tree and the Apache
3+
// This source code is dual-licensed under either the MIT license found in the
4+
// LICENSE-MIT file in the root directory of this source tree or the Apache
55
// License, Version 2.0 found in the LICENSE-APACHE file in the root directory
6-
// of this source tree.
6+
// of this source tree. You may select, at your option, one of the above-listed
7+
// licenses.
78

89
//! Contains the main VOPRF API
910

0 commit comments

Comments
 (0)