Skip to content

Commit cfa1c70

Browse files
committedSep 18, 2024
webpki-roots/webpki-root-certs: fix LICENSE files
These crates mistakenly had license files included for Apache and MIT licenses. Both are derived works under an MPL 2.0 license.
1 parent a533475 commit cfa1c70

File tree

8 files changed

+25
-5
lines changed

8 files changed

+25
-5
lines changed
 

‎LICENSE-MPL

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
This packge contains a modified version of ca-bundle.crt:
2+
3+
ca-bundle.crt -- Bundle of CA Root Certificates
4+
5+
Certificate data from Mozilla as of: Thu Nov 3 19:04:19 2011#
6+
This is a bundle of X.509 certificates of public Certificate Authorities
7+
(CA). These were automatically extracted from Mozilla's root certificates
8+
file (certdata.txt). This file can be found in the mozilla source tree:
9+
http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1#
10+
It contains the certificates in PEM format and therefore
11+
can be directly used with curl / libcurl / php_curl, or with
12+
an Apache+mod_ssl webserver for SSL client authentication.
13+
Just configure this file as the SSLCACertificateFile.#
14+
15+
***** BEGIN LICENSE BLOCK *****
16+
This Source Code Form is subject to the terms of the Mozilla Public License,
17+
v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain
18+
one at http://mozilla.org/MPL/2.0/.
19+
20+
***** END LICENSE BLOCK *****
21+
@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ and revocation data.
2828
# License
2929

3030
The underlying data is MPL-licensed, and the data in `webpki-roots` and `webpki-root-certs`
31-
is therefore a derived work.
31+
is therefore a derived work. The tooling in `webpki-ccadb` is licensed under
32+
both MIT and Apache licenses.

‎webpki-root-certs/LICENSE

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../LICENSE-MPL

‎webpki-root-certs/LICENSE-APACHE

-1
This file was deleted.

‎webpki-root-certs/LICENSE-MIT

-1
This file was deleted.

‎webpki-roots/LICENSE

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../LICENSE-MPL

‎webpki-roots/LICENSE-APACHE

-1
This file was deleted.

‎webpki-roots/LICENSE-MIT

-1
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.