Adjust license of mechanically-reformed crates

Quite a while back these were produced from a MPL-2.0-licensed file ("certdata.txt"). Now they are produced from the same data published by Mozilla as part of the CCADB project. CCADB data is provided under CDLA-2.0-Permissive, a copy of which is included as `LICENSE-CCADB` here.
rustls · Feb 4, 2025 · b02862c · b02862c
1 parent 32504ae
commit b02862c
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 31 deletions.
diff --git a/LICENSE-CCADB b/LICENSE-CCADB
@@ -0,0 +1,61 @@
+# Community Data License Agreement - Permissive - Version 2.0
+
+This is the Community Data License Agreement - Permissive, Version
+2.0 (the "agreement"). Data Provider(s) and Data Recipient(s) agree
+as follows:
+
+## 1. Provision of the Data
+
+1.1. A Data Recipient may use, modify, and share the Data made
+available by Data Provider(s) under this agreement if that Data
+Recipient follows the terms of this agreement.
+
+1.2. This agreement does not impose any restriction on a Data
+Recipient's use, modification, or sharing of any portions of the
+Data that are in the public domain or that may be used, modified,
+or shared under any other legal exception or limitation.
+
+## 2. Conditions for Sharing Data
+
+2.1. A Data Recipient may share Data, with or without modifications, so
+long as the Data Recipient makes available the text of this agreement
+with the shared Data.
+
+## 3. No Restrictions on Results
+
+3.1. This agreement does not impose any restriction or obligations
+with respect to the use, modification, or sharing of Results.
+
+## 4. No Warranty; Limitation of Liability
+
+4.1. All Data Recipients receive the Data subject to the following
+terms:
+
+THE DATA IS PROVIDED ON AN "AS IS" BASIS, WITHOUT REPRESENTATIONS,
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED
+INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+NO DATA PROVIDER SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING
+WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE DATA OR RESULTS,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+## 5. Definitions
+
+5.1. "Data" means the material received by a Data Recipient under
+this agreement.
+
+5.2. "Data Provider" means any person who is the source of Data
+provided under this agreement and in reliance on a Data Recipient's
+agreement to its terms.
+
+5.3. "Data Recipient" means any person who receives Data directly
+or indirectly from a Data Provider and agrees to the terms of this
+agreement.
+
+5.4. "Results" means any outcome obtained by computational analysis
+of Data, including for example machine learning models and models'
+insights.
diff --git a/LICENSE-MPL b/LICENSE-MPL
diff --git a/README.md b/README.md
@@ -27,6 +27,8 @@ and revocation data.
 
 # License
 
-The underlying data is MPL-licensed, and the data in `webpki-roots` and `webpki-root-certs`
-is therefore a derived work. The tooling in `webpki-ccadb` is licensed under
-both MIT and Apache licenses.
+The underlying data is from Common CA Database (CCADB) and is used under the CDLA-2.0-Permissive
+license.  See [CCADB Data Usage Terms](https://www.ccadb.org/rootstores/usage#ccadb-data-usage-terms).
+The data in `webpki-roots` and `webpki-root-certs` is a derived work of the CCADB data.
+
+The tooling in `webpki-ccadb` is licensed under both MIT and Apache licenses.
diff --git a/webpki-root-certs/Cargo.toml b/webpki-root-certs/Cargo.toml
@@ -3,7 +3,7 @@ name = "webpki-root-certs"
 version = "0.26.8"
 edition.workspace = true
 readme = "README.md"
-license = "MPL-2.0"
+license = "CDLA-Permissive-2.0"
 homepage.workspace = true
 repository.workspace = true
 description = "Mozilla trusted certificate authorities in self-signed X.509 format for use with crates other than webpki"

diff --git a/webpki-root-certs/LICENSE b/webpki-root-certs/LICENSE
@@ -1 +1 @@
-../LICENSE-MPL
+../LICENSE-CCADB
diff --git a/webpki-root-certs/README.md b/webpki-root-certs/README.md
@@ -24,7 +24,8 @@ DER data for each trust anchor is included in `webpki_roots`.
 
 # License
 
-The underlying data is MPL-licensed, and `src/lib.rs` is therefore a derived work.
+The underlying data is used via the [CCADB Data Usage Terms](https://www.ccadb.org/rootstores/usage#ccadb-data-usage-terms) (see [`LICENSE`](LICENSE)).
+The data in this crate is a derived work of the CCADB data.
 
 # Regenerating sources
 

diff --git a/webpki-roots/Cargo.toml b/webpki-roots/Cargo.toml
@@ -3,7 +3,7 @@ name = "webpki-roots"
 version = "0.26.8"
 edition = { workspace = true }
 readme = "README.md"
-license = "MPL-2.0"
+license = "CDLA-Permissive-2.0"
 homepage = { workspace = true }
 repository = { workspace = true }
 description = "Mozilla's CA root certificates for use with webpki"

diff --git a/webpki-roots/LICENSE b/webpki-roots/LICENSE
@@ -1 +1 @@
-../LICENSE-MPL
+../LICENSE-CCADB
diff --git a/webpki-roots/README.md b/webpki-roots/README.md
@@ -10,8 +10,8 @@ uses the data provided by the [Common CA Database (CCADB)](https://www.ccadb.org
 [![Crate](https://img.shields.io/crates/v/webpki-roots.svg)](https://crates.io/crates/webpki-roots)
 
 # License
-The underlying data is MPL-licensed, and `src/lib.rs`
-is therefore a derived work.
+The underlying data is used via the [CCADB Data Usage Terms](https://www.ccadb.org/rootstores/usage#ccadb-data-usage-terms) (see [`LICENSE`](LICENSE)).
+The data in this crate is a derived work of the CCADB data.
 
 # Regenerating sources
 Sources are generated in an integration test, in `tests/codegen.rs`. The test