Skip to content

Commit a883737

Browse files
kevinlewikevinlewi
authored
Updating dual-license language (facebook#324)
1 parent 98b42d6 commit a883737

34 files changed

+162
-136
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 opaque-ke, 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
@@ -60,4 +60,6 @@ improvements to the library.
6060
License
6161
-------
6262

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

‎benches/opaque.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
#[macro_use]
910
extern crate criterion;

‎examples/digital_locker.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
//! Demonstrates an implementation of a server-side secured digital locker using
910
//! the client's OPAQUE export key, over a command-line interface

‎examples/simple_login.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
//! Demonstrates a simple client-server password-based login protocol using
910
//! OPAQUE, over a command-line interface

‎scripts/digital_locker.exp

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

710
set timeout 1
811
spawn cargo run --example digital_locker

‎scripts/simple_login.exp

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

710
set timeout 1
811
spawn cargo run --example simple_login

‎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
910
//! OPAQUE

‎src/envelope.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 core::convert::TryFrom;
910
use core::ops::Add;

‎src/errors.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
//! A list of error types which are produced during an execution of the protocol
910
use core::convert::Infallible;

‎src/hash.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
//! A convenience trait for digest bounds used throughout the library
910

‎src/key_exchange/group/curve25519.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
//! Key Exchange group implementation for Curve25519
910

‎src/key_exchange/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/key_exchange/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
//! Includes the KeGroup trait and definitions for the key exchange groups
910

‎src/key_exchange/group/ristretto255.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
//! Key Exchange group implementation for ristretto255
910

‎src/key_exchange/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
//! Includes instantiations of key exchange protocols used in the login step for
910
//! OPAQUE

‎src/key_exchange/traits.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::Output;

‎src/key_exchange/tripledh.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 the Triple Diffie-Hellman key exchange protocol
910
use core::convert::TryFrom;

‎src/keypair.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 keypair types that must be supplied for the OPAQUE API
910

‎src/ksf.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
//! Trait specifying a key stretching function
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 the OPAQUE asymmetric password authentication key
910
//! exchange protocol

‎src/messages.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 messages used for OPAQUE
910

‎src/opaque.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
//! Provides the main OPAQUE API
910

‎src/serialization/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
use core::marker::PhantomData;
910

‎src/serialization/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
use core::ops::Add;
910
use std::vec;

‎src/tests/full_test.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
#![allow(unsafe_code)]
910

0 commit comments

Comments
 (0)